diff --git a/api/app/Http/Controllers/GameController.php b/api/app/Http/Controllers/GameController.php
index 057306e..dbaf22f 100644
--- a/api/app/Http/Controllers/GameController.php
+++ b/api/app/Http/Controllers/GameController.php
@@ -17,6 +17,7 @@ class GameController extends Controller
         $user = Auth::user();
         $query = Game::query()->with(["winner", "player1", "player2"]);
 
+        // Se não for Admin, mostra apenas os jogos do utilizador
         if ($user->type !== 'A') {
             $query->where(function ($q) use ($user) {
                 $q->where('player1_user_id', $user->id)
@@ -40,75 +41,154 @@ class GameController extends Controller
             $query->where("status", $request->status);
         }
 
-         if ($request->has("sort_direction") && in_array($request->sort_direction, ["asc", "desc"])) {
+        if ($request->has("sort_direction") && in_array($request->sort_direction, ["asc", "desc"])) {
             $query->orderBy("began_at", $request->sort_direction);
-        }else{
+        } else {
             $query->orderBy("began_at", "desc");
         }
 
         return response()->json($query->paginate(15));
     }
 
+    // --- MÉTODOS ADICIONADOS ---
+
+    // Host a new multiplayer Game
+    public function host(Request $request)
+    {
+        $request->validate([
+            'type' => 'required|in:3,9'
+        ]);
+
+        $user = $request->user();
+
+        // Check for active game
+        $activeGame = Game::where(function ($q) use ($user) {
+             $q->where("player1_user_id", $user->id)
+               ->orWhere("player2_user_id", $user->id);
+        })
+        ->whereIn("status", ["Pending", "Playing"])
+        ->exists();
+
+        if ($activeGame) {
+             return response()->json(["message" => "You already have an active game."], 400);
+        }
+
+        $game = Game::create([
+            'type' => $request->type,
+            'status' => 'Pending',
+            'player1_user_id' => $user->id,
+            'player2_user_id' => self::GHOST_ID, // Ghost ID = 1 (Waiting for player)
+            'began_at' => now(),
+            'player1_points' => 0,
+            'player2_points' => 0,
+        ]);
+
+        return response()->json($game, 201);
+    }
+
+    // List open games (Available to join)
+    public function open(Request $request)
+    {
+        $type = $request->query('type', '9');
+        $GHOST_ID = 1;
+
+        $games = Game::where('status', 'Pending')
+            ->where('player2_user_id', $GHOST_ID) // Games waiting for P2
+            ->where('type', $type)
+            ->with('player1')
+            ->orderBy('began_at', 'asc')
+            ->paginate(10);
+
+        return response()->json($games);
+    }
+    // ---------------------------
+
     public function store(Request $request)
     {
         $this->authorize('create', Game::class);
 
         $validated = $request->validate([
             "type" => "required|in:3,9",
+            "player2_user_id" => "nullable|integer|exists:users,id",
+            "match_id" => "nullable|integer|exists:matches,id",
+            "status" => "nullable|in:Pending,Playing",
+            "began_at" => "nullable|date"
         ]);
 
         $user = Auth::user();
 
         $activeGame = Game::where(function ($q) use ($user) {
-            $q->where("player1_user_id", $user->id)
-              ->orWhere("player2_user_id", $user->id);
+             $q->where("player1_user_id", $user->id)
+               ->orWhere("player2_user_id", $user->id);
         })
         ->whereIn("status", ["Pending", "Playing"])
         ->exists();
 
         if ($activeGame) {
-            return response()->json(["message" => "You already have an active game."], 400);
+             return response()->json(["message" => "You already have an active game."], 400);
+        }
+
+        $player2Id = $request->input('player2_user_id', self::GHOST_ID);
+
+        $initialStatus = $request->input('status', 'Pending');
+        
+        // If specific player 2 is provided, auto-start game
+        if ($player2Id !== self::GHOST_ID && !$request->has('status')) {
+            $initialStatus = 'Playing';
         }
 
         $game = Game::create([
             "type" => $validated["type"],
-            "status" => "Pending",
+            "status" => $initialStatus,
             "player1_user_id" => $user->id,
-            "player2_user_id" => self::GHOST_ID,
-            "winner_user_id" => self::GHOST_ID,
-            "loser_user_id" => self::GHOST_ID,
-            "began_at" => now(),
+            "player2_user_id" => $player2Id, 
+            "winner_user_id" => null,
+            "loser_user_id" => null,
+            "match_id" => $request->input('match_id', null),
+            "began_at" => $request->input('began_at', now()),
             "player1_points" => 0,
             "player2_points" => 0,
             "custom" => null,
         ]);
 
         return response()->json([
-            "message" => "Multiplayer game room created",
+            "message" => "Game created",
             "game" => $game,
         ], 201);
     }
 
-public function join(Request $request, Game $game)
-{
-    // Prevent joining if already full or started
-    if ($game->status !== 'Pending' || $game->player2_user_id !== 1) {
-        return response()->json(['message' => 'Game is not available'], 400);
+    public function join(Request $request, Game $game)
+    {
+        // Prevent joining if already full or started
+        if ($game->status !== 'Pending' || $game->player2_user_id !== self::GHOST_ID) {
+            return response()->json(['message' => 'Game is not available'], 400);
+        }
+
+        // Prevent joining your own game
+        if ($game->player1_user_id === $request->user()->id) {
+            return response()->json(['message' => 'Cannot join your own game'], 400);
+        }
+        
+        // Check if joining user has another active game
+        $activeGame = Game::where(function ($q) use ($request) {
+             $q->where("player1_user_id", $request->user()->id)
+               ->orWhere("player2_user_id", $request->user()->id);
+        })
+        ->whereIn("status", ["Pending", "Playing"])
+        ->exists();
+
+        if ($activeGame) {
+             return response()->json(["message" => "You already have an active game."], 400);
+        }
+
+        $game->update([
+            'player2_user_id' => $request->user()->id,
+            'status' => 'Playing',
+        ]);
+
+        return response()->json($game);
     }
 
-    // Prevent joining your own game
-    if ($game->player1_user_id === $request->user()->id) {
-        return response()->json(['message' => 'Cannot join your own game'], 400);
-    }
-
-    $game->update([
-        'player2_user_id' => $request->user()->id,
-        'status' => 'Playing',
-    ]);
-
-    return response()->json($game);
-}
-
     public function show(Game $game)
     {
         $this->authorize('view', $game);
@@ -164,4 +244,4 @@ public function join(Request $request, Game $game)
             'game' => $game->fresh(),
         ]);
     }
-}
+}
\ No newline at end of file
diff --git a/api/app/Http/Controllers/MatchController.php b/api/app/Http/Controllers/MatchController.php
index fe6972f..444ccc9 100644
--- a/api/app/Http/Controllers/MatchController.php
+++ b/api/app/Http/Controllers/MatchController.php
@@ -3,12 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Models\MatchGame;
-use App\Models\Game;
 use App\Models\CoinTransaction;
 use App\Models\CoinTransactionType;
 use Illuminate\Http\Request;
 use App\Http\Requests\StoreMatchRequest;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 class MatchController extends Controller
@@ -196,4 +194,77 @@ class MatchController extends Controller
             return response()->json($match);
         });
     }
+
+    public function host(Request $request)
+    {
+        $request->validate([
+            'type' => 'required|in:3,9',
+            'stake' => 'required|integer|min:0'
+        ]);
+
+        $user = $request->user();
+        $stake = $request->stake;
+
+        if ($user->coins_balance < $stake) {
+            return response()->json(['message' => 'Insufficient coin balance'], 400);
+        }
+
+        $activeMatch = MatchGame::where(function ($q) use ($user) {
+            $q->where('player1_user_id', $user->id)
+              ->orWhere('player2_user_id', $user->id);
+        })->whereIn('status', ['Pending', 'Playing'])->exists();
+
+        if ($activeMatch) {
+            return response()->json(['message' => 'You already have an active match.'], 400);
+        }
+
+        return DB::transaction(function () use ($request, $user, $stake) {
+            $GHOST_ID = 1;
+
+            $user->decrement('coins_balance', $stake);
+
+            $stakeType = CoinTransactionType::firstOrCreate(
+                ['name' => 'Match stake'],
+                ['type' => 'D'] // Debit
+            );
+
+            $match = MatchGame::create([
+                'type' => $request->type,
+                'status' => 'Pending',
+                'player1_user_id' => $user->id,
+                'player2_user_id' => $GHOST_ID, 
+                'winner_user_id' => null,
+                'loser_user_id' => null,
+                'stake' => $stake,
+                'began_at' => now(),
+                'player1_marks' => 0, 'player2_marks' => 0,
+                'player1_points' => 0, 'player2_points' => 0,
+            ]);
+
+            CoinTransaction::create([
+                'user_id' => $user->id,
+                'match_id' => $match->id,
+                'coin_transaction_type_id' => $stakeType->id,
+                'transaction_datetime' => now(),
+                'coins' => -$stake,
+            ]);
+
+            return response()->json($match, 201);
+        });
+    }
+
+    public function open(Request $request)
+    {
+        $type = $request->query('type', '9');
+        $GHOST_ID = 1;
+
+        $matches = MatchGame::where('status', 'Pending')
+            ->where('player2_user_id', $GHOST_ID) 
+            ->where('type', $type)
+            ->with('player1')
+            ->orderBy('began_at', 'asc')
+            ->paginate(10);
+
+        return response()->json($matches);
+    }
 }
\ No newline at end of file
diff --git a/api/app/Http/Controllers/UserController.php b/api/app/Http/Controllers/UserController.php
index 98a063d..4e6a608 100644
--- a/api/app/Http/Controllers/UserController.php
+++ b/api/app/Http/Controllers/UserController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Game;
 use App\Models\User;
+use App\Models\MatchGame;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
@@ -178,72 +179,87 @@ class UserController extends Controller
     }
 
     /**
-     * GET /api/users/{user}/matches
-     * Histórico de Jogos Multiplayer do Utilizador
+     * GET /api/users/{user}/games
+     * Histórico de Partidas Individuais (Cartas)
      */
-    public function getMatches(Request $request, User $user)
+    public function getGames(Request $request, User $user)
     {
         $this->authorize('view', $user);
 
-        $outcomeSql = "CASE 
-            WHEN is_draw = 1 THEN 'DRAW'
-            WHEN winner_user_id = {$user->id} THEN 'WIN'
-            ELSE 'LOSS'
-        END";
-
-        $query = Game::query()
-        ->select('*')
-        ->selectRaw("($outcomeSql) as outcome_text")
-        ->where(function ($q) use ($user) {
-            $q->where('player1_user_id', $user->id)
-              ->orWhere('player2_user_id', $user->id);
-        })
-        ->with(['winner', 'player1', 'player2']);
+        // Define a query base para GAMES
+        $query = \App\Models\Game::query()
+            ->where(function ($q) use ($user) {
+                $q->where('player1_user_id', $user->id)
+                  ->orWhere('player2_user_id', $user->id);
+            })
+            ->with(['winner', 'player1', 'player2']);
 
         if ($request->has('type')) {
-            $query->where('type', $request->type); 
+            $query->where('type', $request->type);
         }
 
         if ($request->has('status')) {
             $query->where('status', $request->status);
         }
 
-        if ($request->filled('outcome')) {
-        switch ($request->outcome) {
-            case 'win':
-                $query->where('winner_user_id', $user->id)
-                      ->where('is_draw', 0);
-                break;
-            case 'loss':
-            case 'forfeit': // Forfeit treated as loss for now
-                $query->where('loser_user_id', $user->id)
-                      ->where('is_draw', 0);
-                break;
-            case 'draw':
-                $query->where('is_draw', 1);
-                break;
-        }
+        $sortDirection = $request->get('sort_direction', 'desc');
+        $query->orderBy('began_at', $sortDirection);
+
+        
+        $games = $query->paginate(10);
+
+        $games->getCollection()->transform(function ($game) use ($user) {
+            if ($game->winner_user_id == $user->id) {
+                $game->outcome = 'win';
+            } elseif ($game->is_draw) {
+                $game->outcome = 'draw';
+            } else {
+                $game->outcome = 'loss';
+            }
+            return $game;
+        });
+
+        return response()->json($games);
     }
 
-        if ($request->has('date_from')) {
-            $query->whereDate('began_at', '>=', $request->date_from);
+    /**
+     * GET /api/users/{user}/matches
+     * Histórico de Matches (Apostas / Marcas)
+     */
+    public function getMatches(Request $request, User $user)
+    {
+        $this->authorize('view', $user);
+
+        $query = MatchGame::query() 
+            ->where(function ($q) use ($user) {
+                $q->where('player1_user_id', $user->id)
+                  ->orWhere('player2_user_id', $user->id);
+            })
+            ->with(['winner', 'player1', 'player2']);
+
+        if ($request->has('type')) {
+            $query->where('type', $request->type);
+        }
+        
+        if ($request->has('status')) {
+            $query->where('status', $request->status);
         }
 
-        if ($request->has('date_to')) {
-            $query->whereDate('ended_at', '<=', $request->date_to);
-        }
+        $sortDirection = $request->get('sort_direction', 'desc');
+        $query->orderBy('began_at', $sortDirection);
 
-        $order = $request->get('sort_by', 'began_at');
-        $direction = $request->get('sort_direction', 'desc');
+        $matches = $query->paginate(10);
 
-        if ($order === 'outcome') {
-            $query->orderBy('outcome_text', $direction);
-        } else {
-            $query->orderBy($order, $direction);
-        }
-
-        $matches = $query->orderBy($order, $direction)
-                              ->paginate(10);
+        $matches->getCollection()->transform(function ($match) use ($user) {
+            if ($match->winner_user_id == $user->id) {
+                $match->outcome = 'win';
+            } elseif ($match->winner_user_id && $match->winner_user_id != $user->id) {
+                $match->outcome = 'loss';
+            } else {
+                $match->outcome = 'interrupted'; // Matches geralmente não empatam (alguém chega a 4 marcas)
+            }
+            return $match;
+        });
 
         return response()->json($matches);
     }
diff --git a/api/app/Policies/GamePolicy.php b/api/app/Policies/GamePolicy.php
index 7345bfb..9fbdc9a 100644
--- a/api/app/Policies/GamePolicy.php
+++ b/api/app/Policies/GamePolicy.php
@@ -86,7 +86,6 @@ class GamePolicy
 
         return true;
     }
-
     /**
      * Determine whether the user can update the model.
      */
@@ -96,17 +95,16 @@ class GamePolicy
             return false;
         }
 
-        if (
-            $game->status !== "Playing" ||
-            ($game->player1_user_id !== $user->id &&
-                $game->player2_user_id !== $user->id)
-        ) {
+        if (!in_array($game->status, ['Playing', 'Pending'])) {
+            return false;
+        }
+
+        if ($game->player1_user_id !== $user->id && $game->player2_user_id !== $user->id) {
             return false;
         }
 
         return true;
     }
-
     /**
      * Determine whether the user can delete the model.
      */
diff --git a/api/routes/api.php b/api/routes/api.php
index 1809c01..e4b0a6b 100644
--- a/api/routes/api.php
+++ b/api/routes/api.php
@@ -40,45 +40,14 @@ Route::prefix('v1')->group(function () {
         // User Resources
         Route::prefix('/users')->group(function () {
             Route::get('/{user}', [UserController::class, 'show']);
-            Route::get('/{user}/matches', [
-                UserController::class,
-                'getMatches',
-            ]);
             Route::get('/{user}/transactions', [UserController::class, 'getTransactions']);
+            Route::get('/{user}/games', [UserController::class, 'getGames']);
+            Route::get('/{user}/matches', [UserController::class, 'getMatches']);
         });
 
         Route::prefix('games')->group(function () {
-            //Host a new multiplayer game - MUST come before resource routes
-            Route::post('host', function (\Illuminate\Http\Request $request) {
-                $request->validate([
-                    'type' => 'required|in:3,9'
-                ]);
-
-                $game = \App\Models\Game::create([
-                    'type' => $request->type,
-                    'status' => 'Pending',
-                    'player1_user_id' => $request->user()->id,
-                    'player2_user_id' => 1, // Ghost player
-                    'began_at' => now(),
-                ]);
-
-                return response()->json($game);
-            });
-
-            // List open games (available to join)
-            Route::get('open', function (\Illuminate\Http\Request $request) {
-                $type = $request->query('type', '9');
-
-                $games = \App\Models\Game::where('status', 'Pending')
-                    ->where('player2_user_id', 1) // Only games waiting for a second player
-                    ->where('type', $type)
-                    ->with('player1') // Load player1 relationship
-                    ->orderBy('began_at', 'asc')
-                    ->paginate(10);
-
-                return response()->json($games);
-            });
-
+            Route::post('host', [GameController::class, 'host']);
+            Route::get('open', [GameController::class, 'open']);
             Route::get('/', [GameController::class, 'index']);
             Route::get('/{game}', [GameController::class, 'show']);
             Route::post('/', [GameController::class, 'store']);
@@ -91,6 +60,8 @@ Route::prefix('v1')->group(function () {
         Route::prefix('matches')->group(function () {
             Route::apiResource('/', MatchController::class)->parameters(['' => 'match']);
             Route::post('/{match}/join', [MatchController::class, 'join']);
+            Route::post('host', [MatchController::class, 'host']); // <--- NOVA
+            Route::get('open', [MatchController::class, 'open']);
         });
 
         // Admin Routes
@@ -99,6 +70,8 @@ Route::prefix('v1')->group(function () {
             ->group(function () {
                 Route::get('/statistics', [StatisticsController::class, 'getAdminStats']);
                 Route::get('/transactions', [TransactionController::class, 'index']);
+                Route::get('/games', [GameController::class, 'index']); 
+                Route::get('/matches', [MatchController::class, 'index']);
                 Route::prefix('users')->group(function () {
                     Route::get('/', [UserController::class, 'index']);
                     Route::post('/', [UserController::class, 'store']);
diff --git a/frontend/src/pages/admin/AdminPage.vue b/frontend/src/pages/admin/AdminPage.vue
index b23ee28..1245741 100644
--- a/frontend/src/pages/admin/AdminPage.vue
+++ b/frontend/src/pages/admin/AdminPage.vue
@@ -1,502 +1,846 @@
 <template>
-    <div class="min-h-screen p-4 md:p-8 flex flex-col items-center font-sans text-black">
+  <div class="min-h-screen p-4 md:p-8 flex flex-col items-center font-sans text-black">
+    <div class="max-w-7xl w-full mb-8">
+      <div class="flex flex-col md:flex-row md:justify-between md:items-end gap-6 mb-8">
+        <div>
+          <h1 class="text-4xl font-black uppercase tracking-tighter">Admin Panel</h1>
+          <p class="text-gray-500 text-xs mt-1 uppercase tracking-[0.2em] font-bold">
+            Platform Oversight
+          </p>
+        </div>
+        <button
+          @click="showCreateModal = true"
+          class="px-6 py-3 bg-black text-white text-xs font-bold uppercase tracking-widest hover:bg-gray-800 transition-all active:scale-95 border border-black"
+        >
+          + Create Admin
+        </button>
+      </div>
 
-        <div class="max-w-7xl w-full mb-8">
-            <div class="flex flex-col md:flex-row md:justify-between md:items-end gap-6 mb-8">
-                <div>
-                    <h1 class="text-4xl font-black uppercase tracking-tighter">Admin Panel</h1>
-                    <p class="text-gray-500 text-xs mt-1 uppercase tracking-[0.2em] font-bold">Platform Oversight</p>
-                </div>
-                <button @click="showCreateModal = true"
-                    class="px-6 py-3 bg-black text-white text-xs font-bold uppercase tracking-widest hover:bg-gray-800 transition-all active:scale-95 border border-black">
-                    + Create Admin
-                </button>
-            </div>
-
-            <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
-                <div class="bg-white border border-gray-300 p-6 shadow-sm">
-                    <span class="text-[10px] font-bold uppercase tracking-widest text-gray-400 block mb-1">Total
-                        Players</span>
-                    <span class="text-3xl font-black">{{ stats.global_counters?.total_players ?? 'Loading' }}</span>
-                </div>
-
-                <div class="bg-white border border-gray-300 p-6 shadow-sm">
-                    <span class="text-[10px] font-bold uppercase tracking-widest text-gray-400 block mb-1">Active
-                        Games</span>
-                    <span class="text-3xl font-black">{{ stats.global_counters?.active_games ?? 'Loading' }}</span>
-                </div>
-
-                <div @click="openChart('games')"
-                    class="bg-white border border-gray-300 p-6 shadow-sm cursor-pointer hover:border-black transition-colors group">
-                    <div class="flex justify-between items-start">
-                        <span class="text-[10px] font-bold uppercase tracking-widest text-gray-400 mb-1">Total
-                            Games</span>
-                        <svg class="w-4 h-4 text-gray-300 group-hover:text-black" fill="none" stroke="currentColor"
-                            viewBox="0 0 24 24">
-                            <path d="M7 12l5 5L22 7"></path>
-                        </svg>
-                    </div>
-                    <span class="text-3xl font-black">{{ stats.global_counters?.total_games ?? 'Loading' }}</span>
-                    <span
-                        class="block text-[10px] mt-2 underline opacity-0 group-hover:opacity-100 transition-opacity">View
-                        Volume Chart</span>
-                </div>
-
-                <div @click="openChart('revenue')"
-                    class="bg-black text-white p-6 shadow-lg cursor-pointer hover:bg-gray-900 transition-colors group">
-                    <div class="flex justify-between items-start">
-                        <span class="text-[10px] font-bold uppercase tracking-widest opacity-60 mb-1">Estimated
-                            Revenue</span>
-                        <svg class="w-4 h-4 opacity-40 group-hover:opacity-100" fill="none" stroke="currentColor"
-                            viewBox="0 0 24 24">
-                            <path
-                                d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z">
-                            </path>
-                        </svg>
-                    </div>
-                    <span class="text-3xl font-black">€ {{ (stats.global_counters?.total_coins_purchased /
-                        10).toLocaleString() ?? 'Loading' }}</span>
-                    <span
-                        class="block text-[10px] mt-2 underline opacity-60 group-hover:opacity-100 transition-opacity">View
-                        Purchase History</span>
-                </div>
-            </div>
+      <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
+        <div class="bg-white border border-gray-300 p-6 shadow-sm">
+          <span class="text-[10px] font-bold uppercase tracking-widest text-gray-400 block mb-1"
+            >Total Players</span
+          >
+          <span class="text-3xl font-black">{{
+            stats.global_counters?.total_players ?? 'Loading'
+          }}</span>
         </div>
 
-        <div v-if="activeChart"
-            class="fixed inset-0 bg-black/80 backdrop-blur-md z-[60] flex items-center justify-center p-4"
-            @click.self="activeChart = null">
-            <div class="bg-white border border-gray-300 w-full max-w-5xl overflow-hidden shadow-2xl">
-
-                <div class="p-6 border-b border-gray-300 flex justify-between items-center bg-white">
-                    <div>
-                        <h3 class="text-2xl font-black uppercase tracking-tighter">
-                            {{ activeChart === 'games' ? 'Games Volume' : 'Purchases History' }}
-                        </h3>
-                        <p class="text-[10px] font-bold text-gray-400 uppercase tracking-[0.2em]">Last 12 Months
-                            Activity</p>
-                    </div>
-                    <button @click="activeChart = null"
-                        class="w-12 h-12 flex items-center justify-center border border-black hover:bg-black hover:text-white transition-all group">
-                        <span class="text-xl group-hover:rotate-90 transition-transform">✕</span>
-                    </button>
-                </div>
-
-                <div class="p-12 min-h-[400px] flex flex-col justify-end">
-
-                    <div v-if="chartData.length > 0" class="flex items-end gap-3 h-64 w-full">
-                        <div v-for="(data, index) in chartData" :key="data.month"
-                            class="flex-1 flex flex-col items-center group relative h-full justify-end">
-
-                            <div
-                                class="absolute -top-12 bg-black text-white text-[10px] py-2 px-3 opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none z-10 font-bold">
-                                {{ data.total || data.total_coins }}
-                                <div class="absolute -bottom-1 left-1/2 -translate-x-1/2 w-2 h-2 bg-black rotate-45">
-                                </div>
-                            </div>
-
-                            <div class="w-full bg-black hover:bg-gray-700 transition-all ease-out" :style="{
-                                height: showBars ? `${calculateHeight(data.total || data.total_coins)}%` : '0%',
-                                transitionDelay: `${index * 50}ms`,
-                                transitionDuration: '800ms'
-                            }"></div>
-
-                            <div class="h-8 flex items-center">
-                                <span class="text-[9px] font-black uppercase text-gray-400">
-                                    {{ formatMonth(data.month) }}
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div v-else
-                        class="h-64 flex flex-col items-center justify-center text-gray-400 border-2 border-dashed border-gray-100">
-                        <p class="text-xs font-bold uppercase tracking-widest">No data available for this period</p>
-                    </div>
-                </div>
-
-                <div class="bg-gray-50 p-8 border-t border-gray-300 flex justify-between items-center">
-                    <div class="flex gap-12">
-                        <div v-if="activeChart === 'games'" v-for="gt in stats.charts.games_by_type" :key="gt.type">
-                            <span class="text-[10px] font-bold uppercase text-gray-400 block tracking-widest">Bisca {{
-                                gt.type }}</span>
-                            <span class="text-2xl font-black">{{ gt.total.toLocaleString() }}</span>
-                        </div>
-                        <div v-if="activeChart === 'revenue'">
-                            <span class="text-[10px] font-bold uppercase text-gray-400 block tracking-widest">Total
-                                Period Volume</span>
-                            <span class="text-2xl font-black">{{
-                                stats.global_counters.total_coins_purchased.toLocaleString() }} Coins</span>
-                        </div>
-                    </div>
-                    <div class="text-[10px] font-bold text-gray-400 uppercase italic">
-                        * Admin Full-Access View
-                    </div>
-                </div>
-            </div>
+        <div class="bg-white border border-gray-300 p-6 shadow-sm">
+          <span class="text-[10px] font-bold uppercase tracking-widest text-gray-400 block mb-1"
+            >Active Games</span
+          >
+          <span class="text-3xl font-black">{{
+            stats.global_counters?.active_games ?? 'Loading'
+          }}</span>
         </div>
 
-        <div class="bg-white border border-gray-300 shadow-2xl max-w-7xl w-full overflow-hidden">
-            <div class="flex border-b border-gray-300 bg-gray-50 overflow-x-auto scrollbar-hide">
-                <button v-for="tab in tabs" :key="tab.id" @click="activeTab = tab.id" :class="[
-                    'flex-1 min-w-[150px] p-5 text-xs font-bold uppercase tracking-widest transition-all outline-none',
-                    activeTab === tab.id
-                        ? 'bg-white border-b-2 border-black text-black'
-                        : 'text-gray-400 hover:text-black hover:bg-gray-100 border-b-2 border-transparent'
-                ]">
-                    {{ tab.name }}
-                </button>
-            </div>
-
-            <div class="min-h-[400px]">
-                <div v-if="activeTab === 'users'" class="animate-in fade-in slide-in-from-bottom-2 duration-300">
-                    <div class="overflow-x-auto">
-                        <div id="table-scroll-container"
-                            class="overflow-y-auto h-[500px] scrollbar-thin scrollbar-thumb-black">
-                            <table class="w-full text-left border-collapse sticky-header">
-                                <thead class="bg-gray-50 border-b border-gray-300">
-                                    <tr>
-                                        <th
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Name</th>
-                                        <th
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Coins</th>
-                                        <th @click="handleSort('type')"
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Role
-                                            <span class="ml-1">
-                                                <template v-if="filters.type === 'A'"> (Admins)</template>
-                                                <template v-else-if="filters.type === 'P'"> (Players)</template>
-                                                <template v-else> ↕</template>
-                                            </span>
-                                        </th>
-
-                                        <th @click="handleSort('blocked')"
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Status
-                                            <span class="ml-1">
-                                                <template v-if="filters.blocked === true"> (Blocked)</template>
-                                                <template v-else-if="filters.blocked === false"> (Active)</template>
-                                                <template v-else> ↕</template>
-                                            </span>
-                                        </th>
-                                        <th></th>
-                                    </tr>
-                                </thead>
-                                <tbody class="divide-y divide-gray-100">
-                                    <template v-if="filteredUsers.length > 0">
-                                        <tr v-for="user in filteredUsers" :key="user.id"
-                                            class="hover:bg-gray-50/80 transition-colors">
-                                            <td class="p-4">
-                                                <div class="flex items-center gap-3">
-                                                    <div
-                                                        class="w-10 h-10 bg-black text-white flex items-center justify-center font-bold text-sm border-2 border-black">
-                                                        {{ user.name.charAt(0) }}
-                                                    </div>
-                                                    <div>
-                                                        <div class="text-sm font-bold">{{ user.name }}</div>
-                                                        <div v-if="user.nickname"
-                                                            class="text-xs text-gray-500 font-mono">@{{ user.nickname
-                                                            }}</div>
-                                                        <div class="text-xs text-gray-500 font-mono">{{ user.email }}
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td class="p-4">
-                                                <div v-if="user.coins_balance" class="flex items-center gap-2">
-                                                    <div
-                                                        class="flex items-center justify-center w-5 h-5 bg-purple-400 rounded-full shadow-sm">
-                                                        <span class="text-[10px] font-bold text-purple-900">$</span>
-                                                    </div>
-                                                    <span class="text-[10px] uppercase font-bold tracking-tight">{{
-                                                        user.coins_balance }}</span>
-                                                </div>
-                                            </td>
-                                            <td class="p-4">
-                                                <span :class="[
-                                                    'px-2 py-1 text-[10px] font-bold border',
-                                                    user.type === 'A' ? 'bg-black text-white border-black' : 'bg-white text-gray-600 border-gray-300'
-                                                ]">
-                                                    {{ user.type === 'A' ? 'ADMIN' : 'PLAYER' }}
-                                                </span>
-                                            </td>
-                                            <td class="p-4">
-                                                <div class="flex items-center gap-2">
-                                                    <div
-                                                        :class="['w-2 h-2 rounded-full', user.blocked ? 'bg-red-600' : 'bg-green-500']">
-                                                    </div>
-                                                    <span class="text-[10px] uppercase font-bold tracking-tight">{{
-                                                        user.blocked
-                                                            ? 'Blocked' : 'Active' }}</span>
-                                                </div>
-                                            </td>
-                                            <td class="p-4 text-right">
-                                                <div v-if="user.type != 'A'" class="space-x-2 flex justify-end">
-                                                    <button @click="toggleBlock(user)"
-                                                        class="text-[10px] font-bold uppercase tracking-tighter border-2 border-black px-3 py-1 hover:bg-black hover:text-white transition-all">{{
-                                                            user.blocked ? 'Unblock' : 'Block' }}</button>
-                                                    <button @click=" confirmDelete(user)"
-                                                        class="text-[10px] font-bold uppercase tracking-tighter bg-red-600 text-white border-2 border-red-600 px-3 py-1 hover:bg-red-700 transition-all">Remove</button>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </template>
-                                    <tr v-else-if="!isLoading">
-                                        <td colspan="3"
-                                            class="p-12 text-center text-gray-400 uppercase text-xs font-bold tracking-widest">
-                                            No users found
-                                        </td>
-                                    </tr>
-                                    <tr ref="loadMoreTrigger">
-                                        <td colspan="4" class="p-4 text-center">
-                                            <span v-if="isLoading"
-                                                class="text-[10px] font-bold uppercase animate-pulse">Loading
-                                                more...</span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-                <div v-else-if="activeTab === 'transactions'"
-                    class="animate-in fade-in slide-in-from-bottom-2 duration-300">
-                    <div class="overflow-x-auto">
-                        <div id="table-scroll-container"
-                            class="overflow-y-auto h-[500px] scrollbar-thin scrollbar-thumb-black">
-                            <table class="w-full text-left border-collapse sticky-header">
-                                <thead class="bg-gray-50 border-b border-gray-300">
-                                    <tr>
-                                        <th @click="handleSort('datetime')"
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Date Time
-                                            <span>{{ filters.sort_datetime === 'desc' ? ' ↓' : ' ↑' }}</span>
-                                        </th>
-                                        <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
-                                            User
-                                        </th>
-                                        <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
-                                            Transaction type
-                                        </th>
-                                        <th @click="handleSort('coins')"
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Coins
-                                            <span v-if="filters.sort_coins">
-                                                {{ filters.sort_coins === 'desc' ? ' ↓' : '↑' }}</span>
-                                            <span v-else> ↕</span>
-                                        </th>
-                                    </tr>
-                                </thead>
-                                <tbody class="divide-y divide-gray-100">
-                                    <template v-if="transactions.length > 0">
-                                        <tr v-for="tx in transactions" :key="tx.id"
-                                            class="hover:bg-gray-50/80 transition-colors">
-                                            <td class="p-4 text-xs font-mono text-gray-600">
-                                                {{ new Date(tx.transaction_datetime).toLocaleDateString() }} •
-                                                {{ new Date(tx.transaction_datetime).toLocaleTimeString([], {
-                                                    hour:
-                                                        '2-digit', minute: '2-digit'
-                                                }) }}
-                                            </td>
-                                            <td class="p-4">
-                                                <div class="text-sm font-bold">{{ tx.user?.nickname || 'Guest' }}</div>
-                                                <div class="text-[10px] text-gray-500 font-mono">{{ tx.user?.email }}
-                                                </div>
-                                            </td>
-                                            <td class="p-4">
-                                                <div class="flex items-center gap-4">
-                                                    <div
-                                                        class="px-2 py-1 bg-gray-100 border border-gray-300 text-[9px] font-black uppercase tracking-tighter text-gray-500 min-w-[80px] text-center">
-                                                        {{ tx.type?.name || 'Manual' }}
-                                                    </div>
-                                                </div>
-                                            </td>
-                                            <td class="p-4">
-                                                <div class="inline-flex items-center gap-2">
-                                                    <span :class="[
-                                                        'text-sm font-black tracking-tighter',
-                                                        tx.coins >= 0 ? 'text-green-400' : 'text-red-400'
-                                                    ]">
-                                                        {{ tx.coins > 0 ? '+' : '' }}{{ tx.coins.toLocaleString() }}
-                                                    </span>
-
-                                                    <span
-                                                        class="text-[10px] font-bold text-gray-400 uppercase tracking-widest">Coins</span>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </template>
-                                    <tr v-else-if="!isLoading">
-                                        <td colspan="3"
-                                            class="w-1 p-12 text-center text-gray-400 uppercase text-xs font-bold tracking-widest">
-                                            No transactions found
-                                        </td>
-                                    </tr>
-                                    <tr ref="loadMoreTrigger">
-                                        <td colspan="4" class="p-4 text-center">
-                                            <span v-if="isLoading"
-                                                class="text-[10px] font-bold uppercase animate-pulse">Loading
-                                                more...</span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-
-                <div v-else-if="activeTab === 'games'" class="animate-in fade-in slide-in-from-bottom-2 duration-300">
-                    <div class="overflow-x-auto">
-                        <div id="table-scroll-container"
-                            class="overflow-y-auto h-[500px] scrollbar-thin scrollbar-thumb-black">
-                            <table class="w-full text-left border-collapse sticky-header">
-                                <thead class="bg-gray-50 border-b border-gray-300">
-                                    <tr>
-                                        <th @click="handleSort('date')"
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Timeline
-                                            <span>{{ filters.game_sort_date === 'desc' ? ' ↓' : ' ↑' }}</span>
-                                        </th>
-                                        <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
-                                            Player 1</th>
-                                        <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
-                                            Player 2</th>
-                                        <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
-                                            Result</th>
-                                        <th @click="handleSort('type')"
-                                            class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors">
-                                            Variant
-                                            <span v-if="filters.game_filter_type"> (Bisca {{ filters.game_filter_type
-                                            }})</span>
-                                            <span v-else> ↕</span>
-                                        </th>
-                                    </tr>
-                                </thead>
-                                <tbody class="divide-y divide-gray-100">
-                                    <template v-if="games.length > 0">
-                                        <tr v-for="game in games" :key="game.id"
-                                            class="hover:bg-gray-50/80 transition-colors">
-                                            <td class="p-4">
-                                                <div class="text-[10px] font-mono text-black font-bold">
-                                                    {{ new Date(game.began_at).toLocaleDateString() }}</div>
-                                                <div class="text-[10px] font-mono text-gray-400 italic">
-                                                    {{ new Date(game.began_at).toLocaleTimeString([], {
-                                                        hour: '2-digit',
-                                                        minute: '2-digit'
-                                                    }) }} •
-                                                    {{ new Date(game.ended_at).toLocaleTimeString([], {
-                                                        hour: '2-digit',
-                                                        minute: '2-digit'
-                                                    }) }}
-                                                </div>
-                                            </td>
-
-                                            <td class="p-4">
-                                                <div class="text-sm font-bold text-black">{{ game.player1?.nickname }}
-                                                </div>
-                                                <div
-                                                    class="text-[10px] font-black text-gray-400 uppercase tracking-tighter">
-                                                    {{ game.player1_points }} Points
-                                                </div>
-                                            </td>
-
-                                            <td class="p-4">
-                                                <div class="text-sm font-bold text-black">{{ game.player2?.nickname }}
-                                                </div>
-                                                <div
-                                                    class="text-[10px] font-black text-gray-400 uppercase tracking-tighter">
-                                                    {{ game.player2_points }} Points
-                                                </div>
-                                            </td>
-
-                                            <td class="p-4">
-                                                <div v-if="game.is_draw" class="text-xs font-bold text-gray-400">— Draw
-                                                    —</div>
-                                                <div v-else class="flex flex-col">
-                                                    <span
-                                                        class="text-[9px] font-bold uppercase text-gray-400 tracking-widest mb-0.5">Winner</span>
-                                                    <span
-                                                        class="text-xs font-black bg-black text-white px-2 py-0.5 w-fit uppercase tracking-tighter">
-                                                        {{ game.winner_user_id === game.player1_user_id ?
-                                                            game.player1?.nickname : game.player2?.nickname }}
-                                                    </span>
-                                                </div>
-                                            </td>
-
-                                            <td class="p-4">
-                                                <div
-                                                    class="px-2 py-1 bg-gray-100 border border-gray-300 text-[10px] font-black text-center w-20">
-                                                    BISCA {{ game.type }}
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr ref="loadMoreTrigger">
-                                            <td colspan="5" class="p-8 text-center border-none">
-                                                <div v-if="isLoading" class="flex flex-col items-center gap-2">
-                                                    <div
-                                                        class="w-5 h-5 border-2 border-black border-t-transparent rounded-full animate-spin">
-                                                    </div>
-                                                    <span
-                                                        class="text-[10px] font-black uppercase tracking-[0.2em]">Retrieving
-                                                        match data...</span>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </template>
-                                    <tr v-else-if="!isLoading">
-                                        <td colspan="5"
-                                            class="p-12 text-center text-gray-400 uppercase text-xs font-bold tracking-widest border-none">
-                                            No match history found
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-
-                <div v-else class="p-12 text-center animate-in fade-in duration-500">
-                    <svg class="w-12 h-12 mx-auto mb-4 text-gray-300" fill="none" stroke="currentColor"
-                        viewBox="0 0 24 24">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1"
-                            d="M9 17v-2m3 2v-4m3 4v-6m2 10H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
-                    </svg>
-                    <h2 class="text-sm font-bold uppercase tracking-widest text-gray-400">Detailed logs for {{ activeTab
-                    }} pending API</h2>
-                </div>
-            </div>
+        <div
+          @click="openChart('games')"
+          class="bg-white border border-gray-300 p-6 shadow-sm cursor-pointer hover:border-black transition-colors group"
+        >
+          <div class="flex justify-between items-start">
+            <span class="text-[10px] font-bold uppercase tracking-widest text-gray-400 mb-1"
+              >Total Games</span
+            >
+            <svg
+              class="w-4 h-4 text-gray-300 group-hover:text-black"
+              fill="none"
+              stroke="currentColor"
+              viewBox="0 0 24 24"
+            >
+              <path d="M7 12l5 5L22 7"></path>
+            </svg>
+          </div>
+          <span class="text-3xl font-black">{{
+            stats.global_counters?.total_games ?? 'Loading'
+          }}</span>
+          <span
+            class="block text-[10px] mt-2 underline opacity-0 group-hover:opacity-100 transition-opacity"
+            >View Volume Chart</span
+          >
         </div>
 
-        <div v-if="showCreateModal"
-            class="fixed inset-0 bg-black/60 backdrop-blur-sm z-50 flex items-center justify-center p-4">
-            <div class="bg-white border border-gray-300 w-full max-w-md shadow-2xl animate-in zoom-in-95 duration-200">
-                <div class="p-6 border-b border-gray-300 bg-black text-white">
-                    <h3 class="text-xl font-black uppercase tracking-tighter">New Admin</h3>
-                </div>
-                <form @submit.prevent="handleSubmitAdmin" class="p-6 space-y-4">
-                    <div>
-                        <label class="block text-[10px] font-bold uppercase text-gray-500 mb-1">Full Name</label>
-                        <input v-model="adminForm.name" type="text" required
-                            class="w-full border border-gray-300 p-3 text-sm focus:border-black outline-none transition-colors" />
-                    </div>
-                    <div>
-                        <label class="block text-[10px] font-bold uppercase text-gray-500 mb-1">Email Address</label>
-                        <input v-model="adminForm.email" type="email" required
-                            class="w-full border border-gray-300 p-3 text-sm focus:border-black outline-none transition-colors" />
-                    </div>
-                    <div class="flex gap-3 pt-4">
-                        <button type="button" @click="showCreateModal = false"
-                            class="flex-1 px-4 py-3 border border-gray-300 font-bold uppercase text-xs hover:bg-gray-50 transition-all">Cancel</button>
-                        <button type="submit"
-                            class="flex-1 px-4 py-3 bg-black text-white font-bold uppercase text-xs hover:bg-gray-800 transition-all">Create
-                            Account</button>
-                    </div>
-                </form>
-            </div>
+        <div
+          @click="openChart('revenue')"
+          class="bg-black text-white p-6 shadow-lg cursor-pointer hover:bg-gray-900 transition-colors group"
+        >
+          <div class="flex justify-between items-start">
+            <span class="text-[10px] font-bold uppercase tracking-widest opacity-60 mb-1"
+              >Estimated Revenue</span
+            >
+            <svg
+              class="w-4 h-4 opacity-40 group-hover:opacity-100"
+              fill="none"
+              stroke="currentColor"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+              ></path>
+            </svg>
+          </div>
+          <span class="text-3xl font-black"
+            >€
+            {{
+              (stats.global_counters?.total_coins_purchased / 10).toLocaleString() ?? 'Loading'
+            }}</span
+          >
+          <span
+            class="block text-[10px] mt-2 underline opacity-60 group-hover:opacity-100 transition-opacity"
+            >View Purchase History</span
+          >
         </div>
+      </div>
     </div>
+
+    <div
+      v-if="activeChart"
+      class="fixed inset-0 bg-black/80 backdrop-blur-md z-[60] flex items-center justify-center p-4"
+      @click.self="activeChart = null"
+    >
+      <div class="bg-white border border-gray-300 w-full max-w-5xl overflow-hidden shadow-2xl">
+        <div class="p-6 border-b border-gray-300 flex justify-between items-center bg-white">
+          <div>
+            <h3 class="text-2xl font-black uppercase tracking-tighter">
+              {{ activeChart === 'games' ? 'Games Volume' : 'Purchases History' }}
+            </h3>
+            <p class="text-[10px] font-bold text-gray-400 uppercase tracking-[0.2em]">
+              Last 12 Months Activity
+            </p>
+          </div>
+          <button
+            @click="activeChart = null"
+            class="w-12 h-12 flex items-center justify-center border border-black hover:bg-black hover:text-white transition-all group"
+          >
+            <span class="text-xl group-hover:rotate-90 transition-transform">✕</span>
+          </button>
+        </div>
+
+        <div class="p-12 min-h-[400px] flex flex-col justify-end">
+          <div v-if="chartData.length > 0" class="flex items-end gap-3 h-64 w-full">
+            <div
+              v-for="(data, index) in chartData"
+              :key="data.month"
+              class="flex-1 flex flex-col items-center group relative h-full justify-end"
+            >
+              <div
+                class="absolute -top-12 bg-black text-white text-[10px] py-2 px-3 opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none z-10 font-bold"
+              >
+                {{ data.total || data.total_coins }}
+                <div
+                  class="absolute -bottom-1 left-1/2 -translate-x-1/2 w-2 h-2 bg-black rotate-45"
+                ></div>
+              </div>
+
+              <div
+                class="w-full bg-black hover:bg-gray-700 transition-all ease-out"
+                :style="{
+                  height: showBars ? `${calculateHeight(data.total || data.total_coins)}%` : '0%',
+                  transitionDelay: `${index * 50}ms`,
+                  transitionDuration: '800ms',
+                }"
+              ></div>
+
+              <div class="h-8 flex items-center">
+                <span class="text-[9px] font-black uppercase text-gray-400">
+                  {{ formatMonth(data.month) }}
+                </span>
+              </div>
+            </div>
+          </div>
+
+          <div
+            v-else
+            class="h-64 flex flex-col items-center justify-center text-gray-400 border-2 border-dashed border-gray-100"
+          >
+            <p class="text-xs font-bold uppercase tracking-widest">
+              No data available for this period
+            </p>
+          </div>
+        </div>
+
+        <div class="bg-gray-50 p-8 border-t border-gray-300 flex justify-between items-center">
+          <div class="flex gap-12">
+            <div
+              v-if="activeChart === 'games'"
+              v-for="gt in stats.charts.games_by_type"
+              :key="gt.type"
+            >
+              <span class="text-[10px] font-bold uppercase text-gray-400 block tracking-widest"
+                >Bisca {{ gt.type }}</span
+              >
+              <span class="text-2xl font-black">{{ gt.total.toLocaleString() }}</span>
+            </div>
+            <div v-if="activeChart === 'revenue'">
+              <span class="text-[10px] font-bold uppercase text-gray-400 block tracking-widest"
+                >Total Period Volume</span
+              >
+              <span class="text-2xl font-black"
+                >{{ stats.global_counters.total_coins_purchased.toLocaleString() }} Coins</span
+              >
+            </div>
+          </div>
+          <div class="text-[10px] font-bold text-gray-400 uppercase italic">
+            * Admin Full-Access View
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="bg-white border border-gray-300 shadow-2xl max-w-7xl w-full overflow-hidden">
+      <div class="flex border-b border-gray-300 bg-gray-50 overflow-x-auto scrollbar-hide">
+        <button
+          v-for="tab in tabs"
+          :key="tab.id"
+          @click="activeTab = tab.id"
+          :class="[
+            'flex-1 min-w-[150px] p-5 text-xs font-bold uppercase tracking-widest transition-all outline-none',
+            activeTab === tab.id
+              ? 'bg-white border-b-2 border-black text-black'
+              : 'text-gray-400 hover:text-black hover:bg-gray-100 border-b-2 border-transparent',
+          ]"
+        >
+          {{ tab.name }}
+        </button>
+      </div>
+
+      <div class="min-h-[400px]">
+        <div
+          v-if="activeTab === 'users'"
+          class="animate-in fade-in slide-in-from-bottom-2 duration-300"
+        >
+          <div class="overflow-x-auto">
+            <div
+              id="table-scroll-container"
+              class="overflow-y-auto h-[500px] scrollbar-thin scrollbar-thumb-black"
+            >
+              <table class="w-full text-left border-collapse sticky-header">
+                <thead class="bg-gray-50 border-b border-gray-300">
+                  <tr>
+                    <th
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Name
+                    </th>
+                    <th
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Coins
+                    </th>
+                    <th
+                      @click="handleSort('type')"
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Role
+                      <span class="ml-1">
+                        <template v-if="filters.type === 'A'"> (Admins)</template>
+                        <template v-else-if="filters.type === 'P'"> (Players)</template>
+                        <template v-else> ↕</template>
+                      </span>
+                    </th>
+
+                    <th
+                      @click="handleSort('blocked')"
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Status
+                      <span class="ml-1">
+                        <template v-if="filters.blocked === true"> (Blocked)</template>
+                        <template v-else-if="filters.blocked === false"> (Active)</template>
+                        <template v-else> ↕</template>
+                      </span>
+                    </th>
+                    <th></th>
+                  </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-100">
+                  <template v-if="filteredUsers.length > 0">
+                    <tr
+                      v-for="user in filteredUsers"
+                      :key="user.id"
+                      class="hover:bg-gray-50/80 transition-colors"
+                    >
+                      <td class="p-4">
+                        <div class="flex items-center gap-3">
+                          <div
+                            class="w-10 h-10 bg-black text-white flex items-center justify-center font-bold text-sm border-2 border-black"
+                          >
+                            {{ user.name.charAt(0) }}
+                          </div>
+                          <div>
+                            <div class="text-sm font-bold">{{ user.name }}</div>
+                            <div v-if="user.nickname" class="text-xs text-gray-500 font-mono">
+                              @{{ user.nickname }}
+                            </div>
+                            <div class="text-xs text-gray-500 font-mono">{{ user.email }}</div>
+                          </div>
+                        </div>
+                      </td>
+                      <td class="p-4">
+                        <div v-if="user.coins_balance" class="flex items-center gap-2">
+                          <div
+                            class="flex items-center justify-center w-5 h-5 bg-purple-400 rounded-full shadow-sm"
+                          >
+                            <span class="text-[10px] font-bold text-purple-900">$</span>
+                          </div>
+                          <span class="text-[10px] uppercase font-bold tracking-tight">{{
+                            user.coins_balance
+                          }}</span>
+                        </div>
+                      </td>
+                      <td class="p-4">
+                        <span
+                          :class="[
+                            'px-2 py-1 text-[10px] font-bold border',
+                            user.type === 'A'
+                              ? 'bg-black text-white border-black'
+                              : 'bg-white text-gray-600 border-gray-300',
+                          ]"
+                        >
+                          {{ user.type === 'A' ? 'ADMIN' : 'PLAYER' }}
+                        </span>
+                      </td>
+                      <td class="p-4">
+                        <div class="flex items-center gap-2">
+                          <div
+                            :class="[
+                              'w-2 h-2 rounded-full',
+                              user.blocked ? 'bg-red-600' : 'bg-green-500',
+                            ]"
+                          ></div>
+                          <span class="text-[10px] uppercase font-bold tracking-tight">{{
+                            user.blocked ? 'Blocked' : 'Active'
+                          }}</span>
+                        </div>
+                      </td>
+                      <td class="p-4 text-right">
+                        <div v-if="user.type != 'A'" class="space-x-2 flex justify-end">
+                          <button
+                            @click="toggleBlock(user)"
+                            class="text-[10px] font-bold uppercase tracking-tighter border-2 border-black px-3 py-1 hover:bg-black hover:text-white transition-all"
+                          >
+                            {{ user.blocked ? 'Unblock' : 'Block' }}
+                          </button>
+                          <button
+                            @click="confirmDelete(user)"
+                            class="text-[10px] font-bold uppercase tracking-tighter bg-red-600 text-white border-2 border-red-600 px-3 py-1 hover:bg-red-700 transition-all"
+                          >
+                            Remove
+                          </button>
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <tr v-else-if="!isLoading">
+                    <td
+                      colspan="3"
+                      class="p-12 text-center text-gray-400 uppercase text-xs font-bold tracking-widest"
+                    >
+                      No users found
+                    </td>
+                  </tr>
+                  <tr ref="loadMoreTrigger">
+                    <td colspan="4" class="p-4 text-center">
+                      <span v-if="isLoading" class="text-xs font-bold uppercase animate-pulse"
+                        >Loading more...</span
+                      >
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+
+        <div
+          v-else-if="activeTab === 'transactions'"
+          class="animate-in fade-in slide-in-from-bottom-2 duration-300"
+        >
+          <div class="overflow-x-auto">
+            <div
+              id="table-scroll-container"
+              class="overflow-y-auto h-[500px] scrollbar-thin scrollbar-thumb-black"
+            >
+              <table class="w-full text-left border-collapse sticky-header">
+                <thead class="bg-gray-50 border-b border-gray-300">
+                  <tr>
+                    <th
+                      @click="handleSort('datetime')"
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Date Time
+                      <span>{{ filters.sort_datetime === 'desc' ? ' ↓' : ' ↑' }}</span>
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      User
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Transaction type
+                    </th>
+                    <th
+                      @click="handleSort('coins')"
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Coins
+                      <span v-if="filters.sort_coins">
+                        {{ filters.sort_coins === 'desc' ? ' ↓' : '↑' }}</span
+                      >
+                      <span v-else> ↕</span>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-100">
+                  <template v-if="transactions.length > 0">
+                    <tr
+                      v-for="tx in transactions"
+                      :key="tx.id"
+                      class="hover:bg-gray-50/80 transition-colors"
+                    >
+                      <td class="p-4 text-xs font-mono text-gray-600">
+                        {{ new Date(tx.transaction_datetime).toLocaleDateString() }} •
+                        {{
+                          new Date(tx.transaction_datetime).toLocaleTimeString([], {
+                            hour: '2-digit',
+                            minute: '2-digit',
+                          })
+                        }}
+                      </td>
+                      <td class="p-4">
+                        <div class="text-sm font-bold">{{ tx.user?.nickname || 'Guest' }}</div>
+                        <div class="text-[10px] text-gray-500 font-mono">{{ tx.user?.email }}</div>
+                      </td>
+                      <td class="p-4">
+                        <div class="flex items-center gap-4">
+                          <div
+                            class="px-2 py-1 bg-gray-100 border border-gray-300 text-[9px] font-black uppercase tracking-tighter text-gray-500 min-w-[80px] text-center"
+                          >
+                            {{ tx.type?.name || 'Manual' }}
+                          </div>
+                        </div>
+                      </td>
+                      <td class="p-4">
+                        <div class="inline-flex items-center gap-2">
+                          <span
+                            :class="[
+                              'text-sm font-black tracking-tighter',
+                              tx.coins >= 0 ? 'text-green-400' : 'text-red-400',
+                            ]"
+                          >
+                            {{ tx.coins > 0 ? '+' : '' }}{{ tx.coins.toLocaleString() }}
+                          </span>
+
+                          <span
+                            class="text-[10px] font-bold text-gray-400 uppercase tracking-widest"
+                            >Coins</span
+                          >
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <tr v-else-if="!isLoading">
+                    <td
+                      colspan="3"
+                      class="w-1 p-12 text-center text-gray-400 uppercase text-xs font-bold tracking-widest"
+                    >
+                      No transactions found
+                    </td>
+                  </tr>
+                  <tr ref="loadMoreTrigger">
+                    <td colspan="4" class="p-4 text-center">
+                      <span v-if="isLoading" class="text-xs font-bold uppercase animate-pulse"
+                        >Loading more...</span
+                      >
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+
+        <div
+          v-else-if="activeTab === 'games'"
+          class="animate-in fade-in slide-in-from-bottom-2 duration-300"
+        >
+          <div class="overflow-x-auto">
+            <div
+              id="table-scroll-container"
+              class="overflow-y-auto h-[500px] scrollbar-thin scrollbar-thumb-black"
+            >
+              <table class="w-full text-left border-collapse sticky-header">
+                <thead class="bg-gray-50 border-b border-gray-300">
+                  <tr>
+                    <th
+                      @click="handleSort('date')"
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Timeline
+                      <span>{{ filters.game_sort_direction === 'desc' ? ' ↓' : ' ↑' }}</span>
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Player 1
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Player 2
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Result
+                    </th>
+                    <th
+                      @click="handleSort('type')"
+                      class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500 cursor-pointer hover:text-black transition-colors"
+                    >
+                      Variant
+                      <span v-if="filters.game_type"> (Bisca {{ filters.game_type }})</span>
+                      <span v-else> ↕</span>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-100">
+                  <template v-if="games.length > 0">
+                    <tr
+                      v-for="game in games"
+                      :key="game.id"
+                      class="hover:bg-gray-50/80 transition-colors"
+                    >
+                      <td class="p-4">
+                        <div class="text-[10px] font-mono text-black font-bold">
+                          {{ new Date(game.began_at).toLocaleDateString() }}
+                        </div>
+                        <div class="text-[10px] font-mono text-gray-400 italic">
+                          {{
+                            new Date(game.began_at).toLocaleTimeString([], {
+                              hour: '2-digit',
+                              minute: '2-digit',
+                            })
+                          }}
+                          •
+                          {{
+                            new Date(game.ended_at).toLocaleTimeString([], {
+                              hour: '2-digit',
+                              minute: '2-digit',
+                            })
+                          }}
+                        </div>
+                      </td>
+
+                      <td class="p-4">
+                        <div class="text-sm font-bold text-black">{{ game.player1?.nickname }}</div>
+                        <div
+                          class="text-[10px] font-black text-gray-400 uppercase tracking-tighter"
+                        >
+                          {{ game.player1_points }} Points
+                        </div>
+                      </td>
+
+                      <td class="p-4">
+                        <div class="text-sm font-bold text-black">{{ game.player2?.nickname }}</div>
+                        <div
+                          class="text-[10px] font-black text-gray-400 uppercase tracking-tighter"
+                        >
+                          {{ game.player2_points }} Points
+                        </div>
+                      </td>
+
+                      <td class="p-4">
+                        <div v-if="game.is_draw" class="text-xs font-bold text-gray-400">
+                          — Draw —
+                        </div>
+                        <div v-else class="flex flex-col">
+                          <span
+                            class="text-[9px] font-bold uppercase text-gray-400 tracking-widest mb-0.5"
+                            >Winner</span
+                          >
+                          <span
+                            class="text-xs font-black bg-black text-white px-2 py-0.5 w-fit uppercase tracking-tighter"
+                          >
+                            {{
+                              game.winner_user_id === game.player1_user_id
+                                ? game.player1?.nickname
+                                : game.player2?.nickname
+                            }}
+                          </span>
+                        </div>
+                      </td>
+
+                      <td class="p-4">
+                        <div
+                          class="px-2 py-1 bg-gray-100 border border-gray-300 text-[10px] font-black text-center w-20"
+                        >
+                          BISCA {{ game.type }}
+                        </div>
+                      </td>
+                    </tr>
+                    <tr ref="loadMoreTrigger">
+                      <td colspan="5" class="p-8 text-center border-none">
+                        <div v-if="isLoading" class="flex flex-col items-center gap-2">
+                          <div
+                            class="w-5 h-5 border-2 border-black border-t-transparent rounded-full animate-spin"
+                          ></div>
+                          <span class="text-[10px] font-black uppercase tracking-[0.2em]"
+                            >Retrieving game data...</span
+                          >
+                        </div>
+                      </td>
+                    </tr>
+                  </template>
+                  <tr v-else-if="!isLoading">
+                    <td
+                      colspan="5"
+                      class="p-12 text-center text-gray-400 uppercase text-xs font-bold tracking-widest border-none"
+                    >
+                      No game history found
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+
+        <div
+          v-else-if="activeTab === 'matches'"
+          class="animate-in fade-in slide-in-from-bottom-2 duration-300"
+        >
+          <div class="p-4 bg-gray-50 border-b border-gray-300 flex flex-wrap gap-4 items-end">
+            <div class="flex flex-col gap-1">
+              <label class="text-[10px] font-bold uppercase text-gray-400 tracking-widest"
+                >From</label
+              >
+              <input
+                type="date"
+                v-model="filters.match_date_from"
+                @change="resetAndFetch"
+                class="bg-white border border-gray-300 p-2 text-xs font-bold uppercase outline-none focus:border-black"
+              />
+            </div>
+            <div class="flex flex-col gap-1">
+              <label class="text-[10px] font-bold uppercase text-gray-400 tracking-widest"
+                >To</label
+              >
+              <input
+                type="date"
+                v-model="filters.match_date_to"
+                @change="resetAndFetch"
+                class="bg-white border border-gray-300 p-2 text-xs font-bold uppercase outline-none focus:border-black"
+              />
+            </div>
+            <div class="flex flex-col gap-1">
+              <label class="text-[10px] font-bold uppercase text-gray-400 tracking-widest"
+                >Variant</label
+              >
+              <select
+                v-model="filters.match_type"
+                @change="resetAndFetch"
+                class="bg-white border border-gray-300 p-2 text-xs font-bold uppercase outline-none focus:border-black min-w-[100px]"
+              >
+                <option :value="null">All</option>
+                <option value="3">Bisca 3</option>
+                <option value="9">Bisca 9</option>
+              </select>
+            </div>
+            <div class="flex flex-col gap-1">
+              <label class="text-[10px] font-bold uppercase text-gray-400 tracking-widest"
+                >Outcome</label
+              >
+              <select
+                v-model="filters.match_outcome"
+                @change="resetAndFetch"
+                class="bg-white border border-gray-300 p-2 text-xs font-bold uppercase outline-none focus:border-black min-w-[100px]"
+              >
+                <option :value="null">All</option>
+                <option value="win">Win</option>
+                <option value="draw">Draw</option>
+              </select>
+            </div>
+            <button
+              @click="clearMatchFilters"
+              class="text-[10px] font-bold uppercase underline hover:text-gray-600 mb-2 ml-auto"
+            >
+              Clear
+            </button>
+          </div>
+
+          <div class="overflow-x-auto">
+            <div
+              id="table-scroll-container"
+              class="overflow-y-auto h-[500px] scrollbar-thin scrollbar-thumb-black"
+            >
+              <table class="w-full text-left border-collapse sticky-header">
+                <thead class="bg-gray-50 border-b border-gray-300">
+                  <tr>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Match Date
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Matchup (P1 vs P2)
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Variant
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Outcome
+                    </th>
+                    <th class="p-4 text-[10px] font-bold uppercase tracking-widest text-gray-500">
+                      Total Pot
+                    </th>
+                  </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-100">
+                  <template v-if="matches.length > 0">
+                    <tr
+                      v-for="match in matches"
+                      :key="match.id"
+                      class="hover:bg-gray-50/80 transition-colors"
+                    >
+                      <td class="p-4">
+                        <div class="text-[10px] font-mono text-black font-bold">
+                          {{ new Date(match.began_at).toLocaleDateString() }}
+                        </div>
+                        <div class="text-[10px] font-mono text-gray-400 italic">
+                          {{
+                            new Date(match.began_at).toLocaleTimeString([], {
+                              hour: '2-digit',
+                              minute: '2-digit',
+                            })
+                          }}
+                        </div>
+                      </td>
+                      <td class="p-4">
+                        <div class="flex flex-col gap-1">
+                          <span class="text-xs font-bold"
+                            >{{ match.player1?.nickname }}
+                            <span class="text-gray-400 text-[10px]"
+                              >({{ match.player1_points }})</span
+                            >
+                          </span>
+                          <span class="text-[10px] font-bold text-gray-400 uppercase">vs</span>
+                          <span class="text-xs font-bold"
+                            >{{ match.player2?.nickname }}
+                            <span class="text-gray-400 text-[10px]"
+                              >({{ match.player2_points }})</span
+                            >
+                          </span>
+                        </div>
+                      </td>
+                      <td class="p-4">
+                        <div
+                          class="px-2 py-1 bg-gray-100 border border-gray-300 text-[10px] font-black text-center w-20"
+                        >
+                          BISCA {{ match.type }}
+                        </div>
+                      </td>
+                      <td class="p-4">
+                        <div v-if="match.is_draw" class="text-xs font-bold text-gray-400">Draw</div>
+                        <div v-else>
+                          <span
+                            class="text-xs font-black bg-black text-white px-2 py-0.5 uppercase tracking-tighter"
+                          >
+                            {{
+                              match.winner_user_id === match.player1_user_id
+                                ? match.player1?.nickname
+                                : match.player2?.nickname
+                            }}
+                            Wins
+                          </span>
+                        </div>
+                      </td>
+                      <td class="p-4">
+                        <div class="flex items-center gap-2">
+                          <div
+                            class="w-5 h-5 flex items-center justify-center bg-yellow-100 rounded-full"
+                          >
+                            <span class="text-[10px] font-bold text-yellow-700">C</span>
+                          </div>
+                          <span class="text-sm font-black">
+                            {{ match.stake ? (match.stake * 2).toLocaleString() : '0' }}
+                          </span>
+                          <span
+                            class="text-[10px] font-bold text-gray-400 uppercase tracking-widest"
+                            >Coins</span
+                          >
+                        </div>
+                      </td>
+                    </tr>
+                    <tr ref="loadMoreTrigger">
+                      <td colspan="5" class="p-8 text-center border-none">
+                        <span
+                          v-if="isLoading"
+                          class="text-[10px] font-black uppercase tracking-[0.2em] animate-pulse"
+                          >Loading matches...</span
+                        >
+                      </td>
+                    </tr>
+                  </template>
+                  <tr v-else-if="!isLoading">
+                    <td
+                      colspan="5"
+                      class="p-12 text-center text-gray-400 uppercase text-xs font-bold tracking-widest border-none"
+                    >
+                      No matches found
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div
+      v-if="showCreateModal"
+      class="fixed inset-0 bg-black/60 backdrop-blur-sm z-50 flex items-center justify-center p-4"
+    >
+      <div
+        class="bg-white border border-gray-300 w-full max-w-md shadow-2xl animate-in zoom-in-95 duration-200"
+      >
+        <div class="p-6 border-b border-gray-300 bg-black text-white">
+          <h3 class="text-xl font-black uppercase tracking-tighter">New Admin</h3>
+        </div>
+        <form @submit.prevent="handleSubmitAdmin" class="p-6 space-y-4">
+          <div>
+            <label class="block text-[10px] font-bold uppercase text-gray-500 mb-1"
+              >Full Name</label
+            >
+            <input
+              v-model="adminForm.name"
+              type="text"
+              required
+              class="w-full border border-gray-300 p-3 text-sm focus:border-black outline-none transition-colors"
+            />
+          </div>
+          <div>
+            <label class="block text-[10px] font-bold uppercase text-gray-500 mb-1"
+              >Email Address</label
+            >
+            <input
+              v-model="adminForm.email"
+              type="email"
+              required
+              class="w-full border border-gray-300 p-3 text-sm focus:border-black outline-none transition-colors"
+            />
+          </div>
+          <div class="flex gap-3 pt-4">
+            <button
+              type="button"
+              @click="showCreateModal = false"
+              class="flex-1 px-4 py-3 border border-gray-300 font-bold uppercase text-xs hover:bg-gray-50 transition-all"
+            >
+              Cancel
+            </button>
+            <button
+              type="submit"
+              class="flex-1 px-4 py-3 bg-black text-white font-bold uppercase text-xs hover:bg-gray-800 transition-all"
+            >
+              Create Account
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -513,240 +857,293 @@ const stats = ref({})
 const users = ref([])
 const transactions = ref([])
 const games = ref([])
+const matches = ref([]) // NEW
 const isLoading = ref(false)
 const loadMoreTrigger = ref(null)
 
 const apiStore = useAPIStore()
 
 const pagination = reactive({
-    users: { page: 1, lastPage: 1 },
-    transactions: { page: 1, lastPage: 1 },
-    games: { page: 1, lastPage: 1 }
+  users: { page: 1, lastPage: 1 },
+  transactions: { page: 1, lastPage: 1 },
+  games: { page: 1, lastPage: 1 },
+  matches: { page: 1, lastPage: 1 }, // NEW
 })
 
 const filters = reactive({
-    type: null,
-    blocked: null,
-    sort_datetime: 'desc',
-    sort_coins: null,
-    game_sort_direction: 'desc',
-    game_type: null
+  type: null,
+  blocked: null,
+  sort_datetime: 'desc',
+  sort_coins: null,
+  game_sort_direction: 'desc',
+  game_type: null,
+  // Match filters
+  match_type: null,
+  match_outcome: null,
+  match_date_from: '',
+  match_date_to: '',
 })
 
 watch(activeTab, async () => {
-    resetPagination();
-    await fetchData();
-    await nextTick();
-    setupObserver();
-});
+  resetPagination()
+  await fetchData()
+  await nextTick()
+  setupObserver()
+})
 
 const tabs = [
-    { id: 'users', name: 'User Management' },
-    { id: 'transactions', name: 'Transactions' },
-    { id: 'games', name: 'Games History' }
+  { id: 'users', name: 'User Management' },
+  { id: 'transactions', name: 'Transactions' },
+  { id: 'games', name: 'Games History' },
+  { id: 'matches', name: 'Matches History' }, // NEW
 ]
 
 const chartData = computed(() => {
-    if (!stats.value) return []
-    if (activeChart.value === 'games') return [...stats.value.charts.games_per_month].reverse()
-    if (activeChart.value === 'revenue') return [...stats.value.charts.purchases_per_month].reverse()
-    return []
+  if (!stats.value) return []
+  if (activeChart.value === 'games') return [...stats.value.charts.games_per_month].reverse()
+  if (activeChart.value === 'revenue') return [...stats.value.charts.purchases_per_month].reverse()
+  return []
 })
 
 const openChart = (type) => {
-    activeChart.value = type
-    showBars.value = false
+  activeChart.value = type
+  showBars.value = false
 
-    setTimeout(() => {
-        showBars.value = true
-    }, 50);
+  setTimeout(() => {
+    showBars.value = true
+  }, 50)
 }
 
 const calculateHeight = (value) => {
-    const max = Math.max(...chartData.value.map(d => d.total || d.total_coins))
-    return (value / max) * 100
+  const max = Math.max(...chartData.value.map((d) => d.total || d.total_coins))
+  return (value / max) * 100
 }
 
 const formatMonth = (monthStr) => {
-    const [_, month] = monthStr.split('-')
-    const months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-    return months[parseInt(month) - 1]
+  const [_, month] = monthStr.split('-')
+  const months = [
+    'JAN',
+    'FEB',
+    'MAR',
+    'APR',
+    'MAY',
+    'JUN',
+    'JUL',
+    'AUG',
+    'SEP',
+    'OCT',
+    'NOV',
+    'DEC',
+  ]
+  return months[parseInt(month) - 1]
 }
 
 const adminForm = reactive({ name: '', nickname: '', email: '' })
 
 const toggleBlock = (user) => {
-    user.blocked == false ? apiStore.blockUser(user) : apiStore.unblockUser(user)
-    user.blocked = !user.blocked
+  user.blocked == false ? apiStore.blockUser(user) : apiStore.unblockUser(user)
+  user.blocked = !user.blocked
 }
 
 const confirmDelete = (user) => {
-    if (confirm(`Remove ${user.name}? This action follows platform rules for ${user.type === 'P' ? 'soft-deletion' : 'permanent removal'}.`)) {
-        apiStore.deleteUser(user)
-        users.value = users.value.filter(u => u.id !== user.id)
-    }
+  if (
+    confirm(
+      `Remove ${user.name}? This action follows platform rules for ${user.type === 'P' ? 'soft-deletion' : 'permanent removal'}.`,
+    )
+  ) {
+    apiStore.deleteUser(user)
+    users.value = users.value.filter((u) => u.id !== user.id)
+  }
 }
 
 const handleSubmitAdmin = () => {
-    adminForm.type = 'A'
-    adminForm.password = '123'
-    adminForm.blocked = false
+  adminForm.type = 'A'
+  adminForm.password = '123'
+  adminForm.blocked = false
 
-    const promise = apiStore.postAdmin(adminForm)
-    toast.promise(promise, {
-        loading: 'Calling API',
-        success: () => {
-            return `Admin created with success`
-        },
-        error: (error) =>
-            error.response?.data?.message
-    })
+  const promise = apiStore.postAdmin(adminForm)
+  toast.promise(promise, {
+    loading: 'Calling API',
+    success: () => {
+      return `Admin created with success`
+    },
+    error: (error) => error.response?.data?.message,
+  })
 
-    showCreateModal.value = false
-    adminForm.name = ''; adminForm.email = '';
+  showCreateModal.value = false
+  adminForm.name = ''
+  adminForm.email = ''
 }
 
 const resetPagination = () => {
-    pagination[activeTab.value].page = 1
-    if (activeTab.value === 'users') users.value = []
-    if (activeTab.value === 'transactions') transactions.value = []
-    if (activeTab.value === 'games') games.value = []
+  pagination[activeTab.value].page = 1
+  if (activeTab.value === 'users') users.value = []
+  if (activeTab.value === 'transactions') transactions.value = []
+  if (activeTab.value === 'games') games.value = []
+  if (activeTab.value === 'matches') matches.value = []
 }
 
 const filteredUsers = computed(() => {
-    return users.value.filter(user => user.id !== useAuthStore().currentUserID);
-});
+  return users.value.filter((user) => user.id !== useAuthStore().currentUserID)
+})
+
+const resetAndFetch = async () => {
+  resetPagination()
+  await fetchData()
+}
+
+const clearMatchFilters = async () => {
+  filters.match_type = null
+  filters.match_outcome = null
+  filters.match_date_from = ''
+  filters.match_date_to = ''
+  await resetAndFetch()
+}
 
 const fetchData = async () => {
-    if (isLoading.value) return
-    const currentTab = activeTab.value
-    if (pagination[currentTab].page > pagination[currentTab].lastPage && pagination[currentTab].page !== 1) return
+  if (isLoading.value) return
+  const currentTab = activeTab.value
+  if (
+    pagination[currentTab].page > pagination[currentTab].lastPage &&
+    pagination[currentTab].page !== 1
+  )
+    return
 
-    isLoading.value = true
-    try {
-        let response
-        if (currentTab === 'users') {
-            const params = { page: pagination[currentTab].page, type: filters.type, blocked: filters.blocked };
-            response = await apiStore.getAdminUsers(params);
-            users.value.push(...response.data.data);
-        }
-        else if (currentTab === 'transactions') {
-            const params = {
-                page: pagination[currentTab].page,
-                sort_datetime: filters.sort_datetime,
-                sort_coins: filters.sort_coins
-            };
-            response = await apiStore.getAdminTransactions(params);
-            transactions.value.push(...response.data.data);
-        }
-        else if (currentTab === 'games') {
-            const params = {
-                page: pagination[currentTab].page,
-                sort_direction: filters.game_sort_direction,
-                type: filters.game_type
-            };
-            response = await apiStore.getAdminGames(params);
-            games.value.push(...response.data.data);
-        }
-
-
-        pagination[currentTab].lastPage = response.data.last_page
-        pagination[currentTab].page++
-    } catch (error) {
-        console.error("Fetch failed", error)
-    } finally {
-        isLoading.value = false
+  isLoading.value = true
+  try {
+    let response
+    if (currentTab === 'users') {
+      const params = {
+        page: pagination[currentTab].page,
+        type: filters.type,
+        blocked: filters.blocked,
+      }
+      response = await apiStore.getAdminUsers(params)
+      users.value.push(...response.data.data)
+    } else if (currentTab === 'transactions') {
+      const params = {
+        page: pagination[currentTab].page,
+        sort_datetime: filters.sort_datetime,
+        sort_coins: filters.sort_coins,
+      }
+      response = await apiStore.getAdminTransactions(params)
+      transactions.value.push(...response.data.data)
+    } else if (currentTab === 'games') {
+      const params = {
+        page: pagination[currentTab].page,
+        sort_direction: filters.game_sort_direction,
+        type: filters.game_type,
+      }
+      response = await apiStore.getAdminGames(params)
+      games.value.push(...response.data.data)
+    } else if (currentTab === 'matches') {
+      const params = {
+        page: pagination[currentTab].page,
+        type: filters.match_type,
+        outcome: filters.match_outcome,
+        date_from: filters.match_date_from || undefined,
+        date_to: filters.match_date_to || undefined,
+      }
+      response = await apiStore.getAdminMatches(params)
+      matches.value.push(...response.data.data)
     }
+
+    pagination[currentTab].lastPage = response.data.last_page
+    pagination[currentTab].page++
+  } catch (error) {
+    console.error('Fetch failed', error)
+  } finally {
+    isLoading.value = false
+  }
 }
 
 const handleSort = async (column) => {
-    if (activeTab.value === 'users') {
-        if (column === 'type') {
-            filters.type = filters.type === null ? 'A' : (filters.type === 'A' ? 'P' : null);
-        } else if (column === 'blocked') {
-            filters.blocked = filters.blocked === null ? true : (filters.blocked === true ? false : null);
-        }
+  if (activeTab.value === 'users') {
+    if (column === 'type') {
+      filters.type = filters.type === null ? 'A' : filters.type === 'A' ? 'P' : null
+    } else if (column === 'blocked') {
+      filters.blocked = filters.blocked === null ? true : filters.blocked === true ? false : null
     }
-
-    else if (activeTab.value === 'transactions') {
-        if (column === 'datetime') {
-            filters.sort_datetime = filters.sort_datetime === 'desc' ? 'asc' : 'desc';
-        } else if (column === 'coins') {
-            if (filters.sort_coins === null) filters.sort_coins = 'desc';
-            else if (filters.sort_coins === 'desc') filters.sort_coins = 'asc';
-            else filters.sort_coins = null;
-        }
+  } else if (activeTab.value === 'transactions') {
+    if (column === 'datetime') {
+      filters.sort_datetime = filters.sort_datetime === 'desc' ? 'asc' : 'desc'
+    } else if (column === 'coins') {
+      if (filters.sort_coins === null) filters.sort_coins = 'desc'
+      else if (filters.sort_coins === 'desc') filters.sort_coins = 'asc'
+      else filters.sort_coins = null
     }
-
-    else if (activeTab.value === 'games') {
-        if (column === 'date') {
-            filters.game_sort_direction = filters.game_sort_direction === 'desc' ? 'asc' : 'desc';
-        } else if (column === 'type') {
-            if (filters.game_type === null) filters.game_type = '9';
-            else if (filters.game_type === '9') filters.game_type = '3';
-            else filters.game_type = null;
-        }
+  } else if (activeTab.value === 'games') {
+    if (column === 'date') {
+      filters.game_sort_direction = filters.game_sort_direction === 'desc' ? 'asc' : 'desc'
+    } else if (column === 'type') {
+      if (filters.game_type === null) filters.game_type = '9'
+      else if (filters.game_type === '9') filters.game_type = '3'
+      else filters.game_type = null
     }
+  }
 
-    resetPagination();
-    await fetchData();
-    await nextTick();
-    setupObserver();
-};
+  resetPagination()
+  await fetchData()
+  await nextTick()
+  setupObserver()
+}
 
 const setupObserver = () => {
-    if (window.adminTableObserver) window.adminTableObserver.disconnect();
+  if (window.adminTableObserver) window.adminTableObserver.disconnect()
 
-    const container = document.querySelector('#table-scroll-container');
+  const container = document.querySelector('#table-scroll-container')
 
-    const observer = new IntersectionObserver((entries) => {
-        const currentTab = activeTab.value;
-        const hasMore = pagination[currentTab].page <= pagination[currentTab].lastPage;
+  const observer = new IntersectionObserver(
+    (entries) => {
+      const currentTab = activeTab.value
+      const hasMore = pagination[currentTab].page <= pagination[currentTab].lastPage
 
-        if (entries[0].isIntersecting && !isLoading.value && hasMore) {
-            fetchData();
-        }
-    }, {
-        root: container,
-        threshold: 0.1,
-        rootMargin: '100px'
-    });
+      if (entries[0].isIntersecting && !isLoading.value && hasMore) {
+        fetchData()
+      }
+    },
+    {
+      root: container,
+      threshold: 0.1,
+      rootMargin: '100px',
+    },
+  )
 
-    if (loadMoreTrigger.value) {
-        observer.observe(loadMoreTrigger.value);
-        window.adminTableObserver = observer;
-    }
-};
+  if (loadMoreTrigger.value) {
+    observer.observe(loadMoreTrigger.value)
+    window.adminTableObserver = observer
+  }
+}
 
 onMounted(async () => {
-    const statsResponse = await apiStore.getAdminStats()
-    const globalResponse = await apiStore.getPublicStats()
-    stats.value = statsResponse.data
-    stats.value.global_counters.active_games = globalResponse.data.active_games
+  const statsResponse = await apiStore.getAdminStats()
+  const globalResponse = await apiStore.getPublicStats()
+  stats.value = statsResponse.data
+  stats.value.global_counters.active_games = globalResponse.data.active_games
 
-    await fetchData()
-    await nextTick()
-    setupObserver()
+  await fetchData()
+  await nextTick()
+  setupObserver()
 })
 </script>
 
 <style scoped>
 .sticky-header thead th {
-    position: sticky;
-    top: 0;
-    background-color: #f9fafb;
-    box-shadow: inset 0 -1px 0 #d1d5db;
+  position: sticky;
+  top: 0;
+  background-color: #f9fafb;
+  box-shadow: inset 0 -1px 0 #d1d5db;
 }
 
 #table-scroll-container::-webkit-scrollbar {
-    width: 6px;
+  width: 6px;
 }
 
 #table-scroll-container::-webkit-scrollbar-thumb {
-    background-color: black;
+  background-color: black;
 }
 
 #table-scroll-container::-webkit-scrollbar-track {
-    background-color: #f3f4f6;
+  background-color: #f3f4f6;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/pages/home/HomePage.vue b/frontend/src/pages/home/HomePage.vue
index 554ef38..78851dc 100644
--- a/frontend/src/pages/home/HomePage.vue
+++ b/frontend/src/pages/home/HomePage.vue
@@ -23,6 +23,11 @@ const gObserverTarget = ref(null);
 const gObserver = ref(null);
 const gLoading = ref(false);
 const gPage = ref(1);
+const openMatches = ref([])
+const mObserverTarget = ref(null);
+const mObserver = ref(null);
+const mLoading = ref(false);
+const mPage = ref(1);
 const showHostModal = ref(false)
 const showJoinModal = ref(false)
 const selectedGame = ref(null)
@@ -38,6 +43,21 @@ const lbObserverTarget = ref(null)
 const lbObserver = ref(null)
 const lbMorePages = ref(true)
 const publicStats = ref(null)
+const isLoggedIn = useAuthStore().isLoggedIn
+
+const setupMatchesObserver = () => {
+    if (mObserver.value) mObserver.value.disconnect();
+
+    mObserver.value = new IntersectionObserver((entries) => {
+        if (entries[0].isIntersecting && !mLoading.value && openMatches.value.length > 0) {
+            getPendingMatches();
+        }
+    }, { threshold: 0.1 });
+
+    if (mObserverTarget.value) {
+        mObserver.value.observe(mObserverTarget.value);
+    }
+}
 
 const setupGamesObserver = () => {
     if (gObserver.value) gObserver.value.disconnect();
@@ -67,14 +87,30 @@ const getPendingGames = async (mode = selectedMode.value) => {
 
         const newGames = response.data.data;
         openGames.value = [...openGames.value, ...newGames];
-        gPage.value++;
-    } catch (error) {
-        console.error('Failed to fetch games:', error);
     } finally {
         gLoading.value = false;
     }
 }
 
+const getPendingMatches = async (mode = selectedMode.value) => {
+    if (mLoading.value) return;
+    mLoading.value = true;
+
+    try {
+        const response = await axios.get(`${API_BASE_URL}/matches/open`, {
+            params: {
+                type: mode,
+                page: mPage.value
+            }
+        });
+
+        const newMatches = response.data.data;
+        openMatches.value = [...openMatches.value, ...newMatches];
+    } finally {
+        mLoading.value = false;
+    }
+}
+
 const fetchPublicStats = async () => {
     try {
         const response = await apiStore.getPublicStats()
@@ -145,81 +181,77 @@ const setupLeaderboardObserver = () => {
 
 const clickMode = async (mode) => {
     if (selectedMode.value === mode) return;
-    openGames.value = [];
     selectedMode.value = mode;
+    openGames.value = [];
     gPage.value = 1;
-    await getPendingGames();
+    openMatches.value = [];
+    mPage.value = 1;
+    await Promise.all([getPendingGames(), getPendingMatches()]);
     setupGamesObserver();
+    setupMatchesObserver();
 }
 
 const startSingle = () => {
     router.push({ name: 'bisca' + selectedMode.value });
 }
 
-const JoinGameModal = (game) => {
-    selectedGame.value = game
-    isReady.value = false
-    showJoinModal.value = true
-}
-
-const hostGameModal = () => {
-    showHostModal.value = true
-}
-
 const toggleReady = () => {
     isReady.value = !isReady.value
 }
 
 onMounted(async () => {
     await fetchPublicStats();
-    await getPendingGames();
-    await nextTick();
-    setupGamesObserver();
+    if (isLoggedIn) {
+        await Promise.all([getPendingGames(), getPendingMatches()]);
+        await nextTick();
+        setupGamesObserver();
+        setupMatchesObserver();
+    }
 })
 
 const hostGame = async () => {
-  showHostModal.value = true
+    showHostModal.value = true
 
-  try {
-    const response = await axios.post(`${API_BASE_URL}/games/host`, {
-      type: selectedMode.value
-    })
+    try {
+        const response = await axios.post(`${API_BASE_URL}/games/host`, {
+            type: selectedMode.value
+        })
 
-    const gameId = response.data.id
+        const gameId = response.data.id
 
-    console.log('Game hosted:', gameId)
+        console.log('Game hosted:', gameId)
 
-    router.push({
-      name: 'multiplayer-game',
-      params: { id: gameId },
-      query: { type: selectedMode.value }
-    })
-  } catch (error) {
-    console.error('Failed to host game:', error)
-    console.error('Error details:', error.response?.data)
-    showHostModal.value = false
-    alert('Failed to host game: ' + (error.response?.data?.message || error.message))
-  }
+        router.push({
+            name: 'multiplayer-game',
+            params: { id: gameId },
+            query: { type: selectedMode.value }
+        })
+    } catch (error) {
+        console.error('Failed to host game:', error)
+        console.error('Error details:', error.response?.data)
+        showHostModal.value = false
+        alert('Failed to host game: ' + (error.response?.data?.message || error.message))
+    }
 }
 
 const joinGame = async (game) => {
-  selectedGame.value = game
+    selectedGame.value = game
 
-  try {
-    await axios.post(`${API_BASE_URL}/games/${game.id}/join`)
+    try {
+        await axios.post(`${API_BASE_URL}/games/${game.id}/join`)
 
-    console.log('Joined game:', game.id)
+        console.log('Joined game:', game.id)
 
-    router.push({
-      name: 'multiplayer-game',
-      params: { id: game.id },
-      query: { type: selectedMode.value }
-    })
-  } catch (error) {
-    console.error('Failed to join game:', error)
-    console.error('Error details:', error.response?.data)
-    alert('Failed to join game: ' + (error.response?.data?.message || error.message))
-  }
+        router.push({
+            name: 'multiplayer-game',
+            params: { id: game.id },
+            query: { type: selectedMode.value }
+        })
+    } catch (error) {
+        console.error('Failed to join game:', error)
+        console.error('Error details:', error.response?.data)
+        alert('Failed to join game: ' + (error.response?.data?.message || error.message))
+    }
 }
 
 </script>
@@ -227,7 +259,7 @@ const joinGame = async (game) => {
 <template>
     <div class="min-h-screen bg-cover bg-center transition-all duration-700">
 
-        <div class="flex flex-col justify-center items-center gap-5 pt-10 px-4">
+        <div class="flex flex-col justify-center items-center gap-5 pt-10 pb-10 px-4">
 
             <Card v-if="publicStats" class="w-full max-w-2xl border-[#a855f7] bg-[#f8f0ff] shadow-sm">
                 <CardContent class="p-4">
@@ -293,50 +325,95 @@ const joinGame = async (game) => {
                         </div>
                     </CardContent>
                 </Card>
-                <Card class="w-full max-w-2xl">
+                <Card class="w-full max-w-2xl flex flex-col">
                     <CardHeader>
-                        <CardTitle class="text-3xl font-bold text-center">
-                            Multi Player
-                        </CardTitle>
-                        <CardDescription class="text-center">
-                            Go one on one with another player!
-                        </CardDescription>
+                        <CardTitle class="text-3xl font-bold text-center">Multi Player</CardTitle>
+                        <CardDescription class="text-center">Go one on one with another player!</CardDescription>
                     </CardHeader>
-                    <CardContent class="space-y-6">
-                        <label class="text-sm font-medium">Open games (oldest first)</label>
-                        <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
-                            <div v-if="openGames.length === 0" class="p-6 text-center text-sm text-muted-foreground">
-                                No open games yet. Try hosting one!
+
+                    <CardContent class="flex-1 flex flex-col space-y-6">
+                        <div class="flex flex-col flex-1">
+                            <div class="flex justify-between items-end mb-2">
+                                <label class="text-sm font-bold uppercase tracking-wider text-muted-foreground">Open
+                                    Matches</label>
+                                <Button v-if="isLoggedIn" @click="showHostModal()" size="sm" variant="outline"
+                                    class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
+                                    Host
+                                </Button>
                             </div>
-                            <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
 
-                                <div v-for="(game, index) in openGames" :key="game.id" @click="joinGame(game)"
-                                    class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500">
-
-                                    <div class="flex items-center gap-3">
-                                        <div
-                                            class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-green-100 text-green-700">
-                                            {{ index + 1 }}
-                                        </div>
-                                        <div>
-                                            <div class="font-medium text-sm">Started: {{ game.began_at }}</div>
-                                            <div class="text-xs text-muted-foreground">host: {{
-                                                game.player1?.nickname || 'Anonymous' }}</div>
+                            <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
+                                <div v-if="openGames.length === 0"
+                                    class="p-6 text-center text-sm text-muted-foreground">
+                                    No open macthes yet. Try hosting one!
+                                </div>
+                                <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
+                                    <div v-for="(match, index) in openMatches" :key="match.id"
+                                        class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
+                                        <div class="flex items-center gap-3">
+                                            <div
+                                                class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-red-100 text-red-700">
+                                                {{ index + 1 }}
+                                            </div>
+                                            <div>
+                                                <div class="font-medium text-sm">Match ID: {{ match.id }}</div>
+                                                <div class="text-[10px] text-muted-foreground">{{ new
+                                                    Date(game.began_at).toLocaleDateString() }} • {{ new
+                                                        Date(game.began_at).toLocaleTimeString([], {
+                                                            hour: '2-digit',
+                                                    minute: '2-digit' }) }}
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-
-                                <div ref="gObserverTarget" class="h-10 flex items-center justify-center">
-                                    <span v-if="gLoading" class="text-xs text-purple-500 animate-pulse">Loading
-                                        more...</span>
+                                    <div ref="mObserverTarget" class="h-10 flex items-center justify-center">
+                                        <span v-if="mLoading" class="text-xs text-purple-500 animate-pulse">Loading
+                                            matches...</span>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                        <div class="flex justify-center">
-                            <Button @click="hostGame()" size="lg" variant="secondary"
-                                class="hover:bg-purple-500 hover:text-slate-200">
-                                Host Game
-                            </Button>
+
+                        <div class="flex flex-col flex-1">
+                            <div class="flex justify-between items-end mb-2">
+                                <label class="text-sm font-medium uppercase tracking-wider text-muted-foreground">Open
+                                    Games</label>
+                                <Button v-if="isLoggedIn" @click="hostGame()" size="sm" variant="outline"
+                                    class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
+                                    Host
+                                </Button>
+                            </div>
+
+                            <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
+                                <div v-if="openGames.length === 0"
+                                    class="p-6 text-center text-sm text-muted-foreground">
+                                    No open games yet. Try hosting one!
+                                </div>
+                                <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
+                                    <div v-for="(game, index) in openGames" :key="game.id" @click="joinGame(game)"
+                                        class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
+                                        <div class="flex items-center gap-3">
+                                            <div
+                                                class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-green-100 text-green-700">
+                                                {{ index + 1 }}
+                                            </div>
+                                            <div>
+                                                <div class="font-medium text-sm">Host: {{ game.player1?.nickname ||
+                                                    'Anonymous' }}</div>
+                                                <div class="text-[10px] text-muted-foreground">{{ new
+                                                    Date(game.began_at).toLocaleDateString() }} • {{ new
+                                                        Date(game.began_at).toLocaleTimeString([], {
+                                                            hour: '2-digit',
+                                                    minute: '2-digit' }) }}</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div ref="gObserverTarget" class="h-10 flex items-center justify-center">
+                                        <span v-if="gLoading" class="text-xs text-purple-500 animate-pulse">Loading
+                                            games...</span>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </CardContent>
                 </Card>
diff --git a/frontend/src/pages/user/UserPage.vue b/frontend/src/pages/user/UserPage.vue
index e16057a..66484d6 100644
--- a/frontend/src/pages/user/UserPage.vue
+++ b/frontend/src/pages/user/UserPage.vue
@@ -1,137 +1,244 @@
 <template>
   <div class="min-h-screen p-8 flex items-center justify-center">
-    <!-- Loading State -->
-    <div v-if="loading" class="bg-white border border-gray-300 p-12 text-center shadow-sm max-w-md w-full">
+    <div
+      v-if="loading"
+      class="bg-white border border-gray-300 p-12 text-center shadow-sm max-w-md w-full"
+    >
       <div class="flex flex-col items-center gap-6">
         <div class="spinner"></div>
         <p>Loading your profile...</p>
       </div>
     </div>
 
-    <!-- Error State -->
-    <div v-else-if="error"
-      class="bg-white border border-gray-300 p-12 text-center shadow-sm max-w-md w-full text-gray-800">
-      <svg class="w-12 h-12 mx-auto mb-4 text-black" viewBox="0 0 24 24" fill="none" stroke="currentColor">
+    <div
+      v-else-if="error"
+      class="bg-white border border-gray-300 p-12 text-center shadow-sm max-w-md w-full text-gray-800"
+    >
+      <svg
+        class="w-12 h-12 mx-auto mb-4 text-black"
+        viewBox="0 0 24 24"
+        fill="none"
+        stroke="currentColor"
+      >
         <circle cx="12" cy="12" r="10" stroke-width="2" />
         <line x1="12" y1="8" x2="12" y2="12" stroke-width="2" />
         <line x1="12" y1="16" x2="12.01" y2="16" stroke-width="2" />
       </svg>
       <h3 class="text-2xl mb-2 text-black">Oops! Something went wrong</h3>
       <p class="text-gray-600 mb-6">{{ error }}</p>
-      <button @click="retry"
-        class="flex items-center gap-2 px-6 py-3 bg-black text-white cursor-pointer text-base font-medium transition-colors hover:bg-gray-800 mx-auto">
+      <button
+        @click="retry"
+        class="flex items-center gap-2 px-6 py-3 bg-black text-white cursor-pointer text-base font-medium transition-colors hover:bg-gray-800 mx-auto"
+      >
         <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor">
           <path d="M1 4v6h6M23 20v-6h-6" stroke-width="2" />
-          <path d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15" stroke-width="2" />
+          <path
+            d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"
+            stroke-width="2"
+          />
         </svg>
         Try Again
       </button>
     </div>
 
-    <!-- User Profile -->
-    <div v-else-if="authStore.currentUser"
-      class="bg-white border border-gray-300 shadow-lg max-w-4xl w-full overflow-hidden">
+    <div
+      v-else-if="authStore.currentUser"
+      class="bg-white border border-gray-300 shadow-lg max-w-4xl w-full overflow-hidden"
+    >
       <div class="bg-black p-12 text-center relative text-white border-b border-gray-300">
         <div class="mb-6 relative inline-block">
-          <img v-if="authStore.currentUser.photo_avatar_filename"
-            :src="`${API_BASE_URL.replace('/api/v1', '').replace('v1/')}/storage/photos_avatars/${authStore.currentUser.photo_avatar_filename}`"
-            :alt="authStore.currentUser.name" class="w-24 h-24 border-[3px] border-white object-cover" />
-          <div v-else
-            class="w-24 h-24 border-[3px] border-white bg-white text-black flex items-center justify-center text-4xl font-semibold">
+          <img
+            v-if="authStore.currentUser.photo_avatar_filename"
+            :src="`${API_BASE_URL.replace('/api/v1', '').replace('v1/', '')}/storage/photos_avatars/${authStore.currentUser.photo_avatar_filename}`"
+            :alt="authStore.currentUser.name"
+            class="w-24 h-24 border-[3px] border-white object-cover"
+          />
+          <div
+            v-else
+            class="w-24 h-24 border-[3px] border-white bg-white text-black flex items-center justify-center text-4xl font-semibold"
+          >
             {{ authStore.currentUser.name.charAt(0).toUpperCase() }}
           </div>
-          <button @click="triggerFileInput"
-            class="absolute bottom-0 right-0 w-9 h-9 bg-white border-2 border-black cursor-pointer flex items-center justify-center transition-colors hover:bg-gray-100">
+          <button
+            @click="triggerFileInput"
+            class="absolute bottom-0 right-0 w-9 h-9 bg-white border-2 border-black cursor-pointer flex items-center justify-center transition-colors hover:bg-gray-100"
+          >
             <svg class="w-5 h-5 text-black" viewBox="0 0 24 24" fill="none" stroke="currentColor">
-              <path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"
-                stroke-width="1.5" />
+              <path
+                d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"
+                stroke-width="1.5"
+              />
               <circle cx="12" cy="13" r="4" stroke-width="1.5" />
             </svg>
           </button>
-          <input ref="fileInput" type="file" accept="image/*" @change="handleAvatarUpload" class="hidden" />
+          <input
+            ref="fileInput"
+            type="file"
+            accept="image/*"
+            @change="handleAvatarUpload"
+            class="hidden"
+          />
         </div>
         <div>
           <h1 class="text-3xl font-semibold mb-2">{{ authStore.currentUser.name }}</h1>
           <p class="text-base opacity-80">@{{ authStore.currentUser.nickname }}</p>
         </div>
         <div
-          class="inline-flex items-center gap-2 bg-white text-black px-4 py-2 mt-6 font-medium text-base border border-gray-300">
+          class="inline-flex items-center gap-2 bg-white text-black px-4 py-2 mt-6 font-medium text-base border border-gray-300"
+        >
           <svg class="w-5 h-5 text-black" viewBox="0 0 24 24" fill="none" stroke="currentColor">
             <circle cx="12" cy="12" r="10" stroke-width="1.5" />
-            <text x="12" y="16" text-anchor="middle" fill="currentColor" font-size="12" font-weight="bold">$</text>
+            <text
+              x="12"
+              y="16"
+              text-anchor="middle"
+              fill="currentColor"
+              font-size="12"
+              font-weight="bold"
+            >
+              $
+            </text>
           </svg>
           <span>{{ authStore.currentUser.coins_balance }} coins</span>
         </div>
       </div>
 
       <div>
-        <!-- Tab Navigation -->
-        <div class="flex border-b border-gray-300 bg-gray-50">
+        <div class="flex border-b border-gray-300 bg-gray-50 overflow-x-auto">
           <button
-            :class="['flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black', { 'border-b-black text-black bg-white': activeTab === 'info' }]"
-            @click="activeTab = 'info'">
-            Profile Information
+            :class="[
+              'flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black whitespace-nowrap',
+              { 'border-b-black text-black bg-white': activeTab === 'info' },
+            ]"
+            @click="activeTab = 'info'"
+          >
+            Profile Info
           </button>
           <button
-            :class="['flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black', { 'border-b-black text-black bg-white': activeTab === 'edit' }]"
-            @click="activeTab = 'edit'">
+            :class="[
+              'flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black whitespace-nowrap',
+              { 'border-b-black text-black bg-white': activeTab === 'edit' },
+            ]"
+            @click="activeTab = 'edit'"
+          >
             Edit Profile
           </button>
-          <button v-if="!authStore.isAdmin"
-            :class="['flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black', { 'border-b-black text-black bg-white': activeTab === 'transaction-history' }]"
-            @click="activeTab = 'transaction-history'">
-            Transaction History
-          </button>
-          <button v-if="!authStore.isAdmin"
-            :class="['flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black', { 'border-b-black text-black bg-white': activeTab === 'game-history' }]"
-            @click="activeTab = 'game-history'">
-            Game History
+          <button
+            v-if="!authStore.isAdmin"
+            :class="[
+              'flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black whitespace-nowrap',
+              { 'border-b-black text-black bg-white': activeTab === 'transaction-history' },
+            ]"
+            @click="activeTab = 'transaction-history'"
+          >
+            Transactions
           </button>
           <button
-            :class="['flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black', { 'border-b-black text-black bg-white': activeTab === 'password' }]"
-            @click="activeTab = 'password'">
-            Change Password
+            v-if="!authStore.isAdmin"
+            :class="[
+              'flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black whitespace-nowrap',
+              { 'border-b-black text-black bg-white': activeTab === 'game-history' },
+            ]"
+            @click="activeTab = 'game-history'"
+          >
+            Games
           </button>
-          <button v-if="!authStore.isAdmin"
-            :class="['flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black', { 'border-b-black text-black bg-white': activeTab === 'delete' }]"
-            @click="activeTab = 'delete'">
-            Delete Account
+          <button
+            v-if="!authStore.isAdmin"
+            :class="[
+              'flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black whitespace-nowrap',
+              { 'border-b-black text-black bg-white': activeTab === 'match-history' },
+            ]"
+            @click="activeTab = 'match-history'"
+          >
+            Matches
+          </button>
+          <button
+            :class="[
+              'flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black whitespace-nowrap',
+              { 'border-b-black text-black bg-white': activeTab === 'password' },
+            ]"
+            @click="activeTab = 'password'"
+          >
+            Security
+          </button>
+          <button
+            v-if="!authStore.isAdmin"
+            :class="[
+              'flex-1 p-4 bg-transparent border-none border-b-2 border-transparent cursor-pointer text-sm font-medium text-gray-600 transition-all hover:bg-gray-100 hover:text-black whitespace-nowrap',
+              { 'border-b-black text-black bg-white': activeTab === 'delete' },
+            ]"
+            @click="activeTab = 'delete'"
+          >
+            Delete
           </button>
         </div>
 
-        <!-- Profile Information Tab -->
         <div v-if="activeTab === 'info'" class="p-8">
           <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md">
+            <div
+              class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md"
+            >
               <div class="w-10 h-10 flex items-center justify-center flex-shrink-0 text-gray-600">
-                <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
-                  <path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z" />
+                <svg
+                  class="w-5 h-5"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="1.5"
+                >
+                  <path
+                    d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"
+                  />
                   <polyline points="22,6 12,13 2,6" />
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Email</label>
+                <label
+                  class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider"
+                  >Email</label
+                >
                 <p class="text-sm text-black">{{ authStore.currentUser.email }}</p>
               </div>
             </div>
 
-            <div class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md">
+            <div
+              class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md"
+            >
               <div class="w-10 h-10 flex items-center justify-center flex-shrink-0 text-gray-600">
-                <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
+                <svg
+                  class="w-5 h-5"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="1.5"
+                >
                   <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" />
                   <circle cx="12" cy="7" r="4" />
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Account
-                  Type</label>
-                <p class="text-sm text-black">{{ authStore.currentUser.type === 'P' ? 'Player' : 'Other' }}</p>
+                <label
+                  class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider"
+                  >Account Type</label
+                >
+                <p class="text-sm text-black">
+                  {{ authStore.currentUser.type === 'P' ? 'Player' : 'Other' }}
+                </p>
               </div>
             </div>
 
-            <div class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md">
+            <div
+              class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md"
+            >
               <div class="w-10 h-10 flex items-center justify-center flex-shrink-0 text-gray-600">
-                <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
+                <svg
+                  class="w-5 h-5"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="1.5"
+                >
                   <rect x="3" y="4" width="18" height="18" rx="2" ry="2" />
                   <line x1="16" y1="2" x2="16" y2="6" />
                   <line x1="8" y1="2" x2="8" y2="6" />
@@ -139,102 +246,171 @@
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Member
-                  Since</label>
+                <label
+                  class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider"
+                  >Member Since</label
+                >
                 <p class="text-sm text-black">{{ formatDate(authStore.currentUser.created_at) }}</p>
               </div>
             </div>
 
-            <div class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md">
+            <div
+              class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md"
+            >
               <div class="w-10 h-10 flex items-center justify-center flex-shrink-0 text-gray-600">
-                <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
+                <svg
+                  class="w-5 h-5"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="1.5"
+                >
                   <circle cx="12" cy="12" r="10" />
                   <path d="M9 12l2 2 4-4" />
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Status</label>
+                <label
+                  class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider"
+                  >Status</label
+                >
                 <p>
                   <span
-                    :class="['inline-block px-3 py-1 text-sm font-medium border', authStore.currentUser.blocked ? 'bg-black text-white border-black' : 'bg-white text-black border-black']">
+                    :class="[
+                      'inline-block px-3 py-1 text-sm font-medium border',
+                      authStore.currentUser.blocked
+                        ? 'bg-black text-white border-black'
+                        : 'bg-white text-black border-black',
+                    ]"
+                  >
                     {{ authStore.currentUser.blocked ? 'Blocked' : 'Active' }}
                   </span>
                 </p>
               </div>
             </div>
 
-            <div v-if="authStore.currentUser.email_verified_at"
-              class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md">
+            <div
+              v-if="authStore.currentUser.email_verified_at"
+              class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md"
+            >
               <div class="w-10 h-10 flex items-center justify-center flex-shrink-0 text-gray-600">
-                <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
+                <svg
+                  class="w-5 h-5"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="1.5"
+                >
                   <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14" />
                   <polyline points="22 4 12 14.01 9 11.01" />
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Email
-                  Verified</label>
-                <p class="text-sm text-black">{{ formatDate(authStore.currentUser.email_verified_at) }}</p>
+                <label
+                  class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider"
+                  >Email Verified</label
+                >
+                <p class="text-sm text-black">
+                  {{ formatDate(authStore.currentUser.email_verified_at) }}
+                </p>
               </div>
             </div>
 
-            <div class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md">
+            <div
+              class="flex items-start gap-4 p-5 bg-white border border-gray-300 transition-shadow hover:shadow-md"
+            >
               <div class="w-10 h-10 flex items-center justify-center flex-shrink-0 text-gray-600">
-                <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
+                <svg
+                  class="w-5 h-5"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="1.5"
+                >
                   <polyline points="23 4 23 10 17 10" />
                   <path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10" />
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Last
-                  Updated</label>
+                <label
+                  class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider"
+                  >Last Updated</label
+                >
                 <p class="text-sm text-black">{{ formatDate(authStore.currentUser.updated_at) }}</p>
               </div>
             </div>
           </div>
         </div>
 
-        <!-- Edit Profile Tab -->
         <div v-if="activeTab === 'edit'" class="p-8">
           <form @submit.prevent="updateProfile" class="max-w-lg">
             <div class="mb-6">
               <label for="name" class="block text-sm font-semibold text-gray-800 mb-2">Name</label>
-              <input id="name" v-model="profileForm.name" type="text" required :disabled="updatingProfile"
-                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed" />
+              <input
+                id="name"
+                v-model="profileForm.name"
+                type="text"
+                required
+                :disabled="updatingProfile"
+                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed"
+              />
             </div>
 
             <div class="mb-6">
-              <label for="nickname" class="block text-sm font-semibold text-gray-800 mb-2">Nickname</label>
-              <input id="nickname" v-model="profileForm.nickname" type="text" required :disabled="updatingProfile"
-                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed" />
+              <label for="nickname" class="block text-sm font-semibold text-gray-800 mb-2"
+                >Nickname</label
+              >
+              <input
+                id="nickname"
+                v-model="profileForm.nickname"
+                type="text"
+                required
+                :disabled="updatingProfile"
+                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed"
+              />
             </div>
 
             <div class="flex gap-4 mt-8">
-              <button type="button" @click="resetProfileForm" :disabled="updatingProfile"
-                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-white text-black hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed">
+              <button
+                type="button"
+                @click="resetProfileForm"
+                :disabled="updatingProfile"
+                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-white text-black hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed"
+              >
                 Cancel
               </button>
-              <button type="submit" :disabled="updatingProfile"
-                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-black text-white hover:bg-gray-800 disabled:opacity-50 disabled:cursor-not-allowed">
+              <button
+                type="submit"
+                :disabled="updatingProfile"
+                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-black text-white hover:bg-gray-800 disabled:opacity-50 disabled:cursor-not-allowed"
+              >
                 {{ updatingProfile ? 'Saving...' : 'Save Changes' }}
               </button>
             </div>
 
-            <div v-if="profileMessage"
-              :class="['mt-4 px-3 py-3 border text-sm', profileMessageType === 'success' ? 'bg-blue-50 border-black text-black' : 'bg-red-50 border-black text-black']">
+            <div
+              v-if="profileMessage"
+              :class="[
+                'mt-4 px-3 py-3 border text-sm',
+                profileMessageType === 'success'
+                  ? 'bg-blue-50 border-black text-black'
+                  : 'bg-red-50 border-black text-black',
+              ]"
+            >
               {{ profileMessage }}
             </div>
           </form>
         </div>
 
-        <!-- Transaction History Tab -->
         <div v-if="activeTab === 'transaction-history' && !authStore.isAdmin" class="p-8">
-
           <div class="flex flex-wrap gap-4 mb-6 items-end">
             <div class="flex flex-col gap-1">
               <label class="text-xs font-medium text-muted-foreground">Type</label>
-              <select v-model="filters.type" @change="resetAndFetch"
-                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none">
+              <select
+                v-model="filters.type"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none"
+              >
                 <option value="all">All Types</option>
                 <option value="credit">Credit (+)</option>
                 <option value="debit">Debit (-)</option>
@@ -243,14 +419,24 @@
 
             <div class="flex flex-col gap-1">
               <label class="text-xs font-medium text-muted-foreground">From</label>
-              <input type="date" v-model="filters.startDate" :max="filters.endDate" @change="resetAndFetch"
-                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+              <input
+                type="date"
+                v-model="filters.startDate"
+                :max="filters.endDate"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none"
+              />
             </div>
 
             <div class="flex flex-col gap-1">
               <label class="text-xs font-medium text-muted-foreground">To</label>
-              <input type="date" v-model="filters.endDate" :min="filters.startDate" @change="resetAndFetch"
-                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+              <input
+                type="date"
+                v-model="filters.endDate"
+                :min="filters.startDate"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none"
+              />
             </div>
 
             <button @click="clearFilters" class="text-xs text-purple-500 hover:underline pb-2">
@@ -259,57 +445,81 @@
           </div>
 
           <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
-            <div v-if="transactions.length === 0" class="p-6 text-center text-sm text-muted-foreground">
+            <div
+              v-if="transactions.length === 0"
+              class="p-6 text-center text-sm text-muted-foreground"
+            >
               No transactions yet.
             </div>
             <div v-else class="max-h-[450px] overflow-y-auto custom-scrollbar p-1">
-
-              <div v-for="(transaction) in transactions" :key="transaction.id"
+              <div
+                v-for="transaction in transactions"
+                :key="transaction.id"
                 class="flex items-center justify-between p-4 mb-3 border rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500"
-                :class="[transaction.type === 'credit' ? 'border-green-500/30' : 'border-red-500/30']">
-
+                :class="[
+                  transaction.type === 'credit' ? 'border-green-500/30' : 'border-red-500/30',
+                ]"
+              >
                 <div class="flex items-center gap-4">
-                  <div class="flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-xs font-bold"
-                    :class="transaction.type === 'credit' ? 'bg-green-100 text-green-700' : 'bg-red-100 text-red-700'">
+                  <div
+                    class="flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-xs font-bold"
+                    :class="
+                      transaction.type === 'credit'
+                        ? 'bg-green-100 text-green-700'
+                        : 'bg-red-100 text-red-700'
+                    "
+                  >
                     <span v-if="transaction.type === 'credit'">+</span>
                     <span v-else>-</span>
                   </div>
 
                   <div class="flex flex-col">
                     <div class="font-semibold text-sm">
-                      {{ transaction.category }} </div>
+                      {{ transaction.category }}
+                    </div>
                     <div class="text-xs text-muted-foreground">
                       {{ new Date(transaction.began_at).toLocaleDateString() }} •
-                      {{ new Date(transaction.began_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) }}
+                      {{
+                        new Date(transaction.began_at).toLocaleTimeString([], {
+                          hour: '2-digit',
+                          minute: '2-digit',
+                        })
+                      }}
                     </div>
                   </div>
                 </div>
 
                 <div class="text-right">
-                  <div class="font-bold text-sm"
-                    :class="transaction.type === 'credit' ? 'text-green-600' : 'text-red-600'">
+                  <div
+                    class="font-bold text-sm"
+                    :class="transaction.type === 'credit' ? 'text-green-600' : 'text-red-600'"
+                  >
                     {{ transaction.type === 'credit' ? '+' : '-' }}{{ transaction.amount }} coins
                   </div>
                   <div class="text-[10px] text-muted-foreground uppercase tracking-wider">
-                    {{ transaction.reference }} </div>
+                    {{ transaction.reference }}
+                  </div>
                 </div>
               </div>
 
               <div ref="observerTarget" class="h-10 flex items-center justify-center">
-                <span v-if="isLoading" class="text-xs text-purple-500 animate-pulse">Loading
-                  more...</span>
+                <span v-if="isLoading" class="text-xs text-purple-500 animate-pulse"
+                  >Loading more...</span
+                >
               </div>
             </div>
           </div>
         </div>
 
-        <!-- Game History Tab -->
         <div v-if="activeTab === 'game-history' && !authStore.isAdmin" class="p-8">
           <div class="flex flex-wrap gap-4 mb-6 items-end">
             <div class="flex flex-col gap-1">
               <label class="text-xs font-medium text-muted-foreground">Variant</label>
-              <select v-model="filters.variant" @change="resetAndFetch"
-                class="bg-background border rounded-md px-3 py-2 text-sm outline-none">
+              <select
+                v-model="filters.variant"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm outline-none"
+              >
                 <option value="all">All Variants</option>
                 <option value="3">Bisca 3</option>
                 <option value="9">Bisca 9</option>
@@ -318,8 +528,11 @@
 
             <div class="flex flex-col gap-1">
               <label class="text-xs font-medium text-muted-foreground">Outcome</label>
-              <select v-model="filters.outcome" @change="resetAndFetch"
-                class="bg-background border rounded-md px-3 py-2 text-sm outline-none">
+              <select
+                v-model="filters.outcome"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm outline-none"
+              >
                 <option value="all">All Results</option>
                 <option value="win">Win</option>
                 <option value="loss">Loss</option>
@@ -330,14 +543,24 @@
 
             <div class="flex flex-col gap-1">
               <label class="text-xs font-medium text-muted-foreground">From</label>
-              <input type="date" v-model="filters.startDate" :max="filters.endDate" @change="resetAndFetch"
-                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+              <input
+                type="date"
+                v-model="filters.startDate"
+                :max="filters.endDate"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none"
+              />
             </div>
 
             <div class="flex flex-col gap-1">
               <label class="text-xs font-medium text-muted-foreground">To</label>
-              <input type="date" v-model="filters.endDate" :min="filters.startDate" @change="resetAndFetch"
-                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+              <input
+                type="date"
+                v-model="filters.endDate"
+                :min="filters.startDate"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none"
+              />
             </div>
 
             <button @click="clearFilters" class="text-xs text-purple-500 hover:underline pb-2">
@@ -348,39 +571,49 @@
               <div class="flex flex-col gap-1">
                 <label class="text-xs font-medium text-muted-foreground">Sort By</label>
                 <div class="flex gap-2">
-                  <select v-model="filters.sort.column" @change="resetAndFetch"
-                    class="bg-background border rounded-md px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-purple-500">
+                  <select
+                    v-model="filters.sort.column"
+                    @change="resetAndFetch"
+                    class="bg-background border rounded-md px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-purple-500"
+                  >
                     <option value="began_at">Date</option>
                     <option value="outcome">Outcome</option>
                     <option value="total_time">Duration</option>
                   </select>
 
-                  <button @click="handleSortChange(filters.sort.column)"
+                  <button
+                    @click="handleSortChange(filters.sort.column)"
                     class="bg-background border rounded-md px-4 py-2 text-sm outline-none transition-all hover:ring-2 hover:ring-purple-500 flex items-center justify-center min-w-[42px]"
-                    title="Toggle Order">
+                    title="Toggle Order"
+                  >
                     <span v-if="filters.sort.order === 'desc'" class="leading-none">↓</span>
                     <span v-else class="leading-none">↑</span>
                   </button>
                 </div>
               </div>
             </div>
-
           </div>
+
           <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
             <div v-if="games.length === 0" class="p-6 text-center text-sm text-muted-foreground">
               No games played yet.
             </div>
             <div v-else class="max-h-[450px] overflow-y-auto custom-scrollbar p-1">
-              <div v-for="game in games" :key="game.id"
-                class="p-4 mb-3 border rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500">
+              <div
+                v-for="game in games"
+                :key="game.id"
+                class="p-4 mb-3 border rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500"
+              >
                 <div class="flex items-center justify-between">
                   <div class="flex items-center gap-4">
-                    <div :class="game.outcome === 'win' ? 'text-green-500' : 'text-red-500'"
-                      class="font-bold uppercase text-xs">
+                    <div
+                      :class="game.outcome === 'win' ? 'text-green-500' : 'text-red-500'"
+                      class="font-bold uppercase text-xs"
+                    >
                       {{ game.outcome }}
                     </div>
                     <div>
-                      <div class="font-semibold text-sm">vs {{ game.opponent }}</div>
+                      <div class="font-semibold text-sm">Game #{{ game.id }}</div>
                       <div class="text-xs text-muted-foreground">
                         {{ game.variant }} • {{ game.duration }}
                       </div>
@@ -390,79 +623,282 @@
                   <div class="text-right">
                     <div class="font-bold text-sm">{{ game.amount }} pts</div>
                     <div class="text-[10px] text-muted-foreground">
-                      {{ new Date(game.began_at).toLocaleDateString() }} • {{ new
-                        Date(game.began_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) }}
+                      {{ new Date(game.began_at).toLocaleDateString() }} •
+                      {{
+                        new Date(game.began_at).toLocaleTimeString([], {
+                          hour: '2-digit',
+                          minute: '2-digit',
+                        })
+                      }}
                     </div>
                   </div>
                 </div>
 
-                <div class="mt-3 pt-3 border-t flex gap-4 text-[10px] uppercase font-medium text-muted-foreground">
+                <div
+                  class="mt-3 pt-3 border-t flex gap-4 text-[10px] uppercase font-medium text-muted-foreground"
+                >
                   <span>Capotes: {{ game.details.capotes }}</span>
                   <span>Bandeiras: {{ game.details.bandeiras }}</span>
                 </div>
               </div>
 
               <div ref="observerTarget" class="h-10 flex items-center justify-center">
-                <span v-if="isLoading" class="text-xs text-purple-500 animate-pulse">Loading
-                  more...</span>
+                <span v-if="isLoading" class="text-xs text-purple-500 animate-pulse"
+                  >Loading more...</span
+                >
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div v-if="activeTab === 'match-history' && !authStore.isAdmin" class="p-8">
+          <div class="flex flex-wrap gap-4 mb-6 items-end">
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">Variant</label>
+              <select
+                v-model="filters.variant"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm outline-none"
+              >
+                <option value="all">All Variants</option>
+                <option value="3">Bisca 3</option>
+                <option value="9">Bisca 9</option>
+              </select>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">Outcome</label>
+              <select
+                v-model="filters.outcome"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm outline-none"
+              >
+                <option value="all">All Results</option>
+                <option value="win">Win</option>
+                <option value="loss">Loss</option>
+                <option value="draw">Draw</option>
+                <option value="forfeit">Forfeit</option>
+              </select>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">From</label>
+              <input
+                type="date"
+                v-model="filters.startDate"
+                :max="filters.endDate"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none"
+              />
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">To</label>
+              <input
+                type="date"
+                v-model="filters.endDate"
+                :min="filters.startDate"
+                @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none"
+              />
+            </div>
+
+            <button @click="clearFilters" class="text-xs text-purple-500 hover:underline pb-2">
+              Clear Filters
+            </button>
+
+            <div class="flex flex-row gap-4 ml-auto">
+              <div class="flex flex-col gap-1">
+                <label class="text-xs font-medium text-muted-foreground">Sort By</label>
+                <div class="flex gap-2">
+                  <select
+                    v-model="filters.sort.column"
+                    @change="resetAndFetch"
+                    class="bg-background border rounded-md px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-purple-500"
+                  >
+                    <option value="began_at">Date</option>
+                    <option value="outcome">Outcome</option>
+                    <option value="total_time">Duration</option>
+                  </select>
+
+                  <button
+                    @click="handleSortChange(filters.sort.column)"
+                    class="bg-background border rounded-md px-4 py-2 text-sm outline-none transition-all hover:ring-2 hover:ring-purple-500 flex items-center justify-center min-w-[42px]"
+                    title="Toggle Order"
+                  >
+                    <span v-if="filters.sort.order === 'desc'" class="leading-none">↓</span>
+                    <span v-else class="leading-none">↑</span>
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
+            <div v-if="matches.length === 0" class="p-6 text-center text-sm text-muted-foreground">
+              No matches played yet.
+            </div>
+            <div v-else class="max-h-[450px] overflow-y-auto custom-scrollbar p-1">
+              <div
+                v-for="match in matches"
+                :key="match.id"
+                class="p-4 mb-3 border rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500"
+              >
+                <div class="flex items-center justify-between">
+                  <div class="flex items-center gap-4">
+                    <div
+                      :class="match.outcome === 'win' ? 'text-green-500' : 'text-red-500'"
+                      class="font-bold uppercase text-xs"
+                    >
+                      {{ match.outcome }}
+                    </div>
+                    <div>
+                      <div class="font-semibold text-sm">vs {{ match.opponent }}</div>
+                      <div class="text-xs text-muted-foreground">
+                        {{ match.variant }} • {{ match.duration }}
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="text-right">
+                    <div
+                      class="font-bold text-sm"
+                      :class="{
+                        'text-green-600': match.outcome === 'win',
+                        'text-red-600': match.outcome === 'loss',
+                        'text-gray-600': match.outcome === 'draw',
+                      }"
+                    >
+                      {{ match.outcome === 'win' ? '+' : match.outcome === 'loss' ? '-' : ''
+                      }}{{ match.amount }} coins
+                    </div>
+
+                    <div class="text-[10px] text-muted-foreground">
+                      {{ new Date(match.began_at).toLocaleDateString() }} •
+                      {{
+                        new Date(match.began_at).toLocaleTimeString([], {
+                          hour: '2-digit',
+                          minute: '2-digit',
+                        })
+                      }}
+                    </div>
+                  </div>
+                </div>
+
+                <div
+                  class="mt-3 pt-3 border-t flex gap-4 text-[10px] uppercase font-medium text-muted-foreground"
+                >
+                  <span>Capotes: {{ match.details.capotes }}</span>
+                  <span>Bandeiras: {{ match.details.bandeiras }}</span>
+                </div>
+              </div>
+
+              <div ref="observerTarget" class="h-10 flex items-center justify-center">
+                <span v-if="isLoading" class="text-xs text-purple-500 animate-pulse"
+                  >Loading more...</span
+                >
               </div>
             </div>
           </div>
         </div>
 
-        <!-- Change Password Tab -->
         <div v-if="activeTab === 'password'" class="p-8">
           <form @submit.prevent="changePassword" class="max-w-lg">
             <div class="mb-6">
-              <label for="current_password" class="block text-sm font-semibold text-gray-800 mb-2">Current
-                Password</label>
-              <input id="current_password" v-model="passwordForm.current_password" type="password" required
+              <label for="current_password" class="block text-sm font-semibold text-gray-800 mb-2"
+                >Current Password</label
+              >
+              <input
+                id="current_password"
+                v-model="passwordForm.current_password"
+                type="password"
+                required
                 :disabled="updatingPassword"
-                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed" />
+                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed"
+              />
             </div>
 
             <div class="mb-6">
-              <label for="new_password" class="block text-sm font-semibold text-gray-800 mb-2">New Password</label>
-              <input id="new_password" v-model="passwordForm.new_password" type="password" required minlength="8"
+              <label for="new_password" class="block text-sm font-semibold text-gray-800 mb-2"
+                >New Password</label
+              >
+              <input
+                id="new_password"
+                v-model="passwordForm.new_password"
+                type="password"
+                required
+                minlength="8"
                 :disabled="updatingPassword"
-                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed" />
-              <small class="block mt-1 text-xs text-gray-600">Password must be at least 8 characters long</small>
+                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed"
+              />
+              <small class="block mt-1 text-xs text-gray-600"
+                >Password must be at least 8 characters long</small
+              >
             </div>
 
             <div class="mb-6">
-              <label for="confirm_password" class="block text-sm font-semibold text-gray-800 mb-2">Confirm New
-                Password</label>
-              <input id="confirm_password" v-model="passwordForm.confirm_password" type="password" required
+              <label for="confirm_password" class="block text-sm font-semibold text-gray-800 mb-2"
+                >Confirm New Password</label
+              >
+              <input
+                id="confirm_password"
+                v-model="passwordForm.confirm_password"
+                type="password"
+                required
                 :disabled="updatingPassword"
-                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed" />
+                class="w-full px-3 py-3 border border-gray-300 text-base transition-colors focus:outline-none focus:border-black disabled:bg-gray-100 disabled:cursor-not-allowed"
+              />
             </div>
 
             <div class="flex gap-4 mt-8">
-              <button type="button" @click="resetPasswordForm" :disabled="updatingPassword"
-                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-white text-black hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed">
+              <button
+                type="button"
+                @click="resetPasswordForm"
+                :disabled="updatingPassword"
+                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-white text-black hover:bg-gray-100 disabled:opacity-50 disabled:cursor-not-allowed"
+              >
                 Cancel
               </button>
-              <button type="submit" :disabled="updatingPassword"
-                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-black text-white hover:bg-gray-800 disabled:opacity-50 disabled:cursor-not-allowed">
+              <button
+                type="submit"
+                :disabled="updatingPassword"
+                class="px-6 py-3 border border-black cursor-pointer text-base font-medium transition-all bg-black text-white hover:bg-gray-800 disabled:opacity-50 disabled:cursor-not-allowed"
+              >
                 {{ updatingPassword ? 'Updating...' : 'Change Password' }}
               </button>
             </div>
 
-            <div v-if="passwordMessage"
-              :class="['mt-4 px-3 py-3 border text-sm', passwordMessageType === 'success' ? 'bg-blue-50 border-black text-black' : 'bg-red-50 border-black text-black']">
+            <div
+              v-if="passwordMessage"
+              :class="[
+                'mt-4 px-3 py-3 border text-sm',
+                passwordMessageType === 'success'
+                  ? 'bg-blue-50 border-black text-black'
+                  : 'bg-red-50 border-black text-black',
+              ]"
+            >
               {{ passwordMessage }}
             </div>
           </form>
         </div>
 
-        <!-- Delete Account Tab -->
-        <div v-if="activeTab === 'delete' && !authStore.isAdmin" class="p-8 flex flex-col items-center">
+        <div
+          v-if="activeTab === 'delete' && !authStore.isAdmin"
+          class="p-8 flex flex-col items-center"
+        >
           <div class="max-w-lg">
             <div class="border border-red-600 bg-red-50 p-6 mb-6">
               <div class="flex items-start gap-3">
-                <svg class="w-6 h-6 text-red-600 flex-shrink-0 mt-0.5" viewBox="0 0 24 24" fill="none"
-                  stroke="currentColor" stroke-width="2">
-                  <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" />
+                <svg
+                  class="w-6 h-6 text-red-600 flex-shrink-0 mt-0.5"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="2"
+                >
+                  <path
+                    d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
+                  />
                   <line x1="12" y1="9" x2="12" y2="13" />
                   <line x1="12" y1="17" x2="12.01" y2="17" />
                 </svg>
@@ -473,8 +909,10 @@
                   </p>
                   <ul class="text-sm text-red-800 list-disc list-inside space-y-1">
                     <li>Permanently delete all your account data</li>
-                    <li>Forfeit your current coin balance of <strong>{{ authStore.currentUser.coins_balance }}
-                        coins</strong></li>
+                    <li>
+                      Forfeit your current coin balance of
+                      <strong>{{ authStore.currentUser.coins_balance }} coins</strong>
+                    </li>
                     <li>Remove your access to all games and matches</li>
                     <li>Delete your profile and all associated information</li>
                   </ul>
@@ -483,25 +921,32 @@
             </div>
 
             <div class="bg-white border border-gray-300 p-6">
-              <h4 class="text-base font-semibold text-gray-900 mb-4">
-                Are you absolutely sure?
-              </h4>
+              <h4 class="text-base font-semibold text-gray-900 mb-4">Are you absolutely sure?</h4>
               <p class="text-sm text-gray-600 mb-4">
-                To confirm deletion, please type your email address: <strong class="text-black">{{
-                  authStore.currentUser.email }}</strong>
+                To confirm deletion, please type your email address:
+                <strong class="text-black">{{ authStore.currentUser.email }}</strong>
               </p>
 
-              <input v-model="deleteConfirmEmail" type="text" placeholder="Enter your email to confirm"
-                class="w-full px-3 py-3 border border-gray-300 text-base mb-4 focus:outline-none focus:border-red-600" />
+              <input
+                v-model="deleteConfirmEmail"
+                type="text"
+                placeholder="Enter your email to confirm"
+                class="w-full px-3 py-3 border border-gray-300 text-base mb-4 focus:outline-none focus:border-red-600"
+              />
 
               <div class="flex gap-4">
-                <button type="button" @click="activeTab = 'info'"
-                  class="flex-1 px-6 py-3 border border-gray-300 cursor-pointer text-base font-medium transition-all bg-white text-gray-700 hover:bg-gray-50">
+                <button
+                  type="button"
+                  @click="activeTab = 'info'"
+                  class="flex-1 px-6 py-3 border border-gray-300 cursor-pointer text-base font-medium transition-all bg-white text-gray-700 hover:bg-gray-50"
+                >
                   Cancel
                 </button>
-                <button @click="showDeleteConfirmation = true"
+                <button
+                  @click="showDeleteConfirmation = true"
                   :disabled="deleteConfirmEmail !== authStore.currentUser.email"
-                  class="flex-1 px-6 py-3 border border-red-600 cursor-pointer text-base font-medium transition-all bg-red-600 text-white hover:bg-red-700 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-red-600">
+                  class="flex-1 px-6 py-3 border border-red-600 cursor-pointer text-base font-medium transition-all bg-red-600 text-white hover:bg-red-700 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-red-600"
+                >
                   Delete My Account
                 </button>
               </div>
@@ -511,10 +956,11 @@
       </div>
     </div>
 
-    <!-- Delete Confirmation Modal -->
-    <div v-if="showDeleteConfirmation"
+    <div
+      v-if="showDeleteConfirmation"
       class="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center p-4 z-50"
-      @click.self="showDeleteConfirmation = false">
+      @click.self="showDeleteConfirmation = false"
+    >
       <div class="bg-white border border-gray-300 max-w-md w-full shadow-xl">
         <div class="p-6 border-b border-gray-300">
           <h3 class="text-xl font-semibold text-gray-900">Final Confirmation</h3>
@@ -522,8 +968,13 @@
 
         <div class="p-6">
           <div class="flex items-start gap-3 mb-4">
-            <svg class="w-12 h-12 text-red-600 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor"
-              stroke-width="2">
+            <svg
+              class="w-12 h-12 text-red-600 flex-shrink-0"
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+            >
               <circle cx="12" cy="12" r="10" />
               <line x1="15" y1="9" x2="9" y2="15" />
               <line x1="9" y1="9" x2="15" y2="15" />
@@ -533,8 +984,9 @@
                 This is your last chance to cancel.
               </p>
               <p class="text-sm text-gray-600">
-                Once you click "Yes, Delete My Account", your account and all associated data will be permanently
-                deleted. You will lose your <strong>{{ authStore.currentUser.coins_balance }} coins</strong> forever.
+                Once you click "Yes, Delete My Account", your account and all associated data will
+                be permanently deleted. You will lose your
+                <strong>{{ authStore.currentUser.coins_balance }} coins</strong> forever.
               </p>
             </div>
           </div>
@@ -546,21 +998,28 @@
         </div>
 
         <div class="p-6 border-t border-gray-300 flex gap-3">
-          <button @click="showDeleteConfirmation = false" :disabled="deletingAccount"
-            class="flex-1 px-6 py-3 border border-gray-300 cursor-pointer text-base font-medium transition-all bg-white text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
+          <button
+            @click="showDeleteConfirmation = false"
+            :disabled="deletingAccount"
+            class="flex-1 px-6 py-3 border border-gray-300 cursor-pointer text-base font-medium transition-all bg-white text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed"
+          >
             Cancel
           </button>
-          <button @click="deleteAccount" :disabled="deletingAccount"
-            class="flex-1 px-6 py-3 border border-red-600 cursor-pointer text-base font-medium transition-all bg-red-600 text-white hover:bg-red-700 disabled:opacity-50 disabled:cursor-not-allowed">
+          <button
+            @click="deleteAccount"
+            :disabled="deletingAccount"
+            class="flex-1 px-6 py-3 border border-red-600 cursor-pointer text-base font-medium transition-all bg-red-600 text-white hover:bg-red-700 disabled:opacity-50 disabled:cursor-not-allowed"
+          >
             Yes, Delete My Account
           </button>
         </div>
       </div>
     </div>
 
-    <!-- No Data State -->
-    <div v-else-if="!authStore.isLoggedIn"
-      class="bg-white border border-gray-300 p-12 text-center shadow-sm max-w-md w-full">
+    <div
+      v-else-if="!authStore.isLoggedIn"
+      class="bg-white border border-gray-300 p-12 text-center shadow-sm max-w-md w-full"
+    >
       <div class="flex flex-col items-center gap-6">
         <div class="spinner"></div>
         <p>Redirecting to login...</p>
@@ -588,7 +1047,7 @@ const fileInput = ref(null)
 
 const profileForm = reactive({
   name: '',
-  nickname: ''
+  nickname: '',
 })
 const updatingProfile = ref(false)
 const profileMessage = ref('')
@@ -597,7 +1056,7 @@ const profileMessageType = ref('')
 const passwordForm = reactive({
   current_password: '',
   new_password: '',
-  confirm_password: ''
+  confirm_password: '',
 })
 const updatingPassword = ref(false)
 const passwordMessage = ref('')
@@ -607,17 +1066,19 @@ const deleteConfirmEmail = ref('')
 const showDeleteConfirmation = ref(false)
 const deletingAccount = ref(false)
 
-const transactions = ref([]);
-const games = ref([]);
+const transactions = ref([])
+const games = ref([])
+const matches = ref([])
 
-const observerTarget = ref(null);
-const observer = ref(null);
-const isLoading = ref(false);
+const observerTarget = ref(null)
+const observer = ref(null)
+const isLoading = ref(false)
 
 const pagination = ref({
   transactions: { page: 1, hasMore: true },
-  games: { page: 1, hasMore: true }
-});
+  games: { page: 1, hasMore: true },
+  matches: { page: 1, hasMore: true },
+})
 
 const filters = ref({
   type: 'all',
@@ -627,193 +1088,263 @@ const filters = ref({
   endDate: '',
   sort: {
     column: 'began_at',
-    order: 'desc'
-  }
-});
+    order: 'desc',
+  },
+})
 
 const handleSortChange = (column) => {
   if (filters.value.sort.column === column) {
-    filters.value.sort.order = filters.value.sort.order === 'asc' ? 'desc' : 'asc';
+    filters.value.sort.order = filters.value.sort.order === 'asc' ? 'desc' : 'asc'
   } else {
-    filters.value.sort.column = column;
-    filters.value.sort.order = 'desc';
+    filters.value.sort.column = column
+    filters.value.sort.order = 'desc'
   }
-  resetAndFetch();
-};
+  resetAndFetch()
+}
 
 watch(activeTab, async (newTab) => {
-  if (newTab !== 'transaction-history' && newTab !== 'game-history') return;
+  if (newTab !== 'transaction-history' && newTab !== 'game-history' && newTab !== 'match-history')
+    return
 
-  await nextTick();
+  await nextTick()
 
-  if (transactions.value.length !== 0 && games.value.length !== 0) return;
+  if (newTab === 'transaction-history' && transactions.value.length > 0) return
+  if (newTab === 'game-history' && games.value.length > 0) return
+  if (newTab === 'match-history' && matches.value.length > 0) return
 
-  await fetchData();
-  setupObserver();
-});
+  await fetchData()
+  setupObserver()
+})
 
 const fetchData = async () => {
-  const currentTab = activeTab.value;
-  const isTransaction = currentTab === 'transaction-history';
-  const isGame = currentTab === 'game-history';
-  const state = isTransaction ? pagination.value.transactions : pagination.value.games;
+  const currentTab = activeTab.value
+  const isTransaction = currentTab === 'transaction-history'
+  const isGame = currentTab === 'game-history'
+  const isMatch = currentTab === 'match-history'
 
-  if (isLoading.value || !state.hasMore) return;
-  isLoading.value = true;
+  let state
+  if (isTransaction) state = pagination.value.transactions
+  else if (isGame) state = pagination.value.games
+  else if (isMatch) state = pagination.value.matches
+
+  if (isLoading.value || !state || !state.hasMore) return
+  isLoading.value = true
 
   try {
-    let newData = [];
+    let newData = []
 
     if (isTransaction) {
       const apiParams = {
         page: state.page,
-        type: filters.value.type === 'credit' ? 'C' : filters.value.type === 'debit' ? 'D' : undefined,
+        type:
+          filters.value.type === 'credit' ? 'C' : filters.value.type === 'debit' ? 'D' : undefined,
         date_from: filters.value.startDate || undefined,
         date_to: filters.value.endDate || undefined,
-      };
+      }
 
-      const response = await apiStore.getCurrentUserTransactions(apiParams);
-      const apiTxns = response.data.data;
+      const response = await apiStore.getCurrentUserTransactions(apiParams)
+      const apiTxns = response.data.data
 
-      newData = apiTxns.map(txn => ({
+      newData = apiTxns.map((txn) => ({
         id: txn.id.toString(),
         type: txn.type.type === 'D' ? 'debit' : 'credit',
         category: txn.type.name,
         amount: Math.abs(txn.coins),
         began_at: txn.transaction_datetime,
-        reference: txn.match_id ? `Match #${txn.match_id}` : txn.game_id ? `Game #${txn.game_id}` : 'N/A'
-      }));
+        reference: txn.match_id
+          ? `Match #${txn.match_id}`
+          : txn.game_id
+            ? `Game #${txn.game_id}`
+            : 'N/A',
+      }))
 
-      transactions.value.push(...newData);
+      transactions.value.push(...newData)
+    }
+
+    const gameMatchParams = {
+      page: state.page,
+      type: filters.value.variant !== 'all' ? filters.value.variant : undefined,
+      outcome: filters.value.outcome !== 'all' ? filters.value.outcome : undefined,
+      status: 'Ended',
+      date_from: filters.value.startDate || undefined,
+      date_to: filters.value.endDate || undefined,
+      sort_by: filters.value.sort.column,
+      sort_direction: filters.value.sort.order,
     }
 
     if (isGame) {
-      const apiParams = {
-        page: state.page,
-        type: filters.value.variant !== 'all' ? filters.value.variant : undefined,
-        outcome: filters.value.outcome !== 'all' ? filters.value.outcome : undefined,
-        status: 'Ended',
-        date_from: filters.value.startDate || undefined,
-        date_to: filters.value.endDate || undefined,
-        sort_by: filters.value.sort.column,
-        sort_direction: filters.value.sort.order,
-      };
+      const response = await apiStore.getCurrentUserGames(gameMatchParams)
+      const apiGames = response.data.data
 
-      const response = await apiStore.getCurrentUserMatches(apiParams);
-      const apiGames = response.data.data;
+      newData = apiGames.map((game) => {
+        let outcome = 'loss'
+        if (game.game_status === 'E') {
+          if (game.total_time < 9999) outcome = 'win'
+        }
+        if (game.winner_user_id === authStore.currentUser.id) outcome = 'win'
 
-      newData = apiGames.map(game => {
-        const isPlayer1 = game.player1_user_id === authStore.currentUser.id;
-        const opponent = isPlayer1 ? game.player2 : game.player1;
+        return {
+          id: game.id,
+          variant: `Type ${game.type}`,
+          outcome: outcome,
+          opponent: null,
+          amount: game.total_points || 0,
+          duration: `${Math.floor(game.total_time / 60)}m ${game.total_time % 60}s`,
+          began_at: game.began_at,
+          details: {
+            capotes: 0,
+            bandeiras: 0,
+          },
+        }
+      })
+      games.value.push(...newData)
+    }
+    if (isMatch) {
+      const response = await apiStore.getCurrentUserMatches(gameMatchParams)
+      const apiMatches = response.data.data
 
-        let outcome = 'loss';
-        if (game.is_draw) outcome = 'draw';
-        else if (game.winner_user_id === authStore.currentUser.id) outcome = 'win';
+      newData = apiMatches.map((game) => {
+        const isPlayer1 = game.player1_user_id === authStore.currentUser.id
+        const opponent = isPlayer1 ? game.player2 : game.player1
+
+        let outcome = 'loss'
+        if (game.is_draw) outcome = 'draw'
+        else if (game.winner_user_id === authStore.currentUser.id) outcome = 'win'
+
+        // LÓGICA CORRIGIDA PARA COINS
+        // A API devolve 'stake' (o valor que cada um apostou)
+        let stakeAmount = 0
+        if (game.stake) {
+          stakeAmount = parseFloat(game.stake)
+        }
+
+        // Se Ganhou: O lucro é o valor da stake (ex: apostou 10, recebeu 20, lucro +10)
+        // Se Perdeu: O prejuízo é o valor da stake (ex: -10)
+        // Se Empate: Normalmente devolve-se a aposta, por isso é 0 (ou ajusta conforme a tua regra)
+        let displayAmount = 0
+
+        if (outcome === 'win') {
+          displayAmount = stakeAmount // Ganhou a aposta do outro
+        } else if (outcome === 'loss') {
+          displayAmount = stakeAmount // Perdeu a sua aposta (o sinal negativo é adicionado no HTML)
+        }
 
         return {
           id: game.id,
           variant: `Type ${game.type}`,
           outcome: outcome,
           opponent: opponent?.nickname || 'Unknown Player',
-          amount: isPlayer1 ? game.player1_points : game.player2_points,
+          amount: displayAmount, // Valor corrigido
           duration: `${Math.floor(game.total_time / 60)}m ${game.total_time % 60}s`,
           began_at: game.began_at,
           details: {
             capotes: 0,
-            bandeiras: 0
-          }
-        };
-      });
-      games.value.push(...newData);
+            bandeiras: 0,
+          },
+        }
+      })
+      matches.value.push(...newData)
     }
 
-    if (newData.length < 10) state.hasMore = false;
-    state.page++;
+    if (newData.length < 10) state.hasMore = false
+    state.page++
   } catch (error) {
-    console.error("Fetch failed", error);
+    console.error('Fetch failed', error)
   } finally {
-    isLoading.value = false;
+    isLoading.value = false
   }
-};
+}
 
 const setupObserver = () => {
-  if (observer.value) observer.value.disconnect();
+  if (observer.value) observer.value.disconnect()
 
-  const scrollContainer = document.querySelector('.custom-scrollbar');
+  const scrollContainer = document.querySelector('.custom-scrollbar')
 
-  observer.value = new IntersectionObserver(async (entries) => {
-    const isGame = activeTab.value === 'game-history';
-    const hasMore = isGame ? pagination.value.games.hasMore : pagination.value.transactions.hasMore;
+  observer.value = new IntersectionObserver(
+    async (entries) => {
+      const isGame = activeTab.value === 'game-history'
+      const isMatch = activeTab.value === 'match-history'
 
-    if (entries[0].isIntersecting && !isLoading.value && hasMore) {
-      fetchData();
-    }
-  }, {
-    root: scrollContainer,
-    threshold: 0.1,
-    rootMargin: '100px'
-  });
+      let hasMore = false
+      if (activeTab.value === 'transaction-history') hasMore = pagination.value.transactions.hasMore
+      else if (isGame) hasMore = pagination.value.games.hasMore
+      else if (isMatch) hasMore = pagination.value.matches.hasMore
 
-  if (observerTarget.value) observer.value.observe(observerTarget.value);
-};
+      if (entries[0].isIntersecting && !isLoading.value && hasMore) {
+        fetchData()
+      }
+    },
+    {
+      root: scrollContainer,
+      threshold: 0.1,
+      rootMargin: '100px',
+    },
+  )
+
+  if (observerTarget.value) observer.value.observe(observerTarget.value)
+}
 
 const resetAndFetch = async () => {
   if (activeTab.value === 'transaction-history') {
-    transactions.value = [];
-    pagination.value.transactions = { page: 1, hasMore: true };
+    transactions.value = []
+    pagination.value.transactions = { page: 1, hasMore: true }
   }
 
   if (activeTab.value === 'game-history') {
-    games.value = [];
-    pagination.value.games = { page: 1, hasMore: true };
+    games.value = []
+    pagination.value.games = { page: 1, hasMore: true }
   }
 
-  await nextTick();
-  await fetchData();
-  setupObserver();
-};
+  if (activeTab.value === 'match-history') {
+    matches.value = []
+    pagination.value.matches = { page: 1, hasMore: true }
+  }
+
+  await nextTick()
+  await fetchData()
+  setupObserver()
+}
 
 const clearFilters = () => {
-  const isGameTab = activeTab.value === 'game-history';
-  const defaultSortColumn = isGameTab ? 'began_at' : 'transaction_datetime';
+  const isGameOrMatch = activeTab.value === 'game-history' || activeTab.value === 'match-history'
+  const defaultSortColumn = isGameOrMatch ? 'began_at' : 'transaction_datetime'
 
   const isAlreadyDefault =
     filters.value.startDate === '' &&
     filters.value.endDate === '' &&
     filters.value.sort.column === defaultSortColumn &&
     filters.value.sort.order === 'desc' &&
-    (isGameTab
-      ? (filters.value.variant === 'all' && filters.value.outcome === 'all')
-      : (filters.value.type === 'all')
-    );
+    (isGameOrMatch
+      ? filters.value.variant === 'all' && filters.value.outcome === 'all'
+      : filters.value.type === 'all')
 
   if (isAlreadyDefault) {
-    return;
+    return
   }
 
-  if (isGameTab) {
-    filters.value.variant = 'all';
-    filters.value.outcome = 'all';
+  if (isGameOrMatch) {
+    filters.value.variant = 'all'
+    filters.value.outcome = 'all'
   } else {
-    filters.value.type = 'all';
+    filters.value.type = 'all'
   }
 
-  filters.value.startDate = '';
-  filters.value.endDate = '';
+  filters.value.startDate = ''
+  filters.value.endDate = ''
   filters.value.sort = {
     column: defaultSortColumn,
-    order: 'desc'
-  };
+    order: 'desc',
+  }
 
-  resetAndFetch();
-};
+  resetAndFetch()
+}
 
 const formatDate = (dateString) => {
   const date = new Date(dateString)
   return date.toLocaleDateString('en-US', {
     year: 'numeric',
     month: 'long',
-    day: 'numeric'
+    day: 'numeric',
   })
 }
 
@@ -868,7 +1399,7 @@ const updateProfile = async () => {
   try {
     const response = await axios.put(`${API_BASE_URL}/users/me`, {
       name: profileForm.name,
-      nickname: profileForm.nickname
+      nickname: profileForm.nickname,
     })
 
     authStore.currentUser = response.data
@@ -903,7 +1434,7 @@ const changePassword = async () => {
     await axios.put(`${API_BASE_URL}/users/me/password`, {
       current_password: passwordForm.current_password,
       new_password: passwordForm.new_password,
-      new_password_confirmation: passwordForm.confirm_password
+      new_password_confirmation: passwordForm.confirm_password,
     })
 
     passwordMessage.value = 'Password changed successfully!'
@@ -931,8 +1462,8 @@ const handleAvatarUpload = async (event) => {
   try {
     const response = await axios.post(`${API_BASE_URL}/users/me/avatar`, formData, {
       headers: {
-        'Content-Type': 'multipart/form-data'
-      }
+        'Content-Type': 'multipart/form-data',
+      },
     })
 
     authStore.currentUser = response.data
@@ -966,8 +1497,8 @@ onMounted(async () => {
   }
   const route = useRoute()
   if (route.query.tab) {
-    activeTab.value = route.query.tab;
-    router.replace({ query: {} });
+    activeTab.value = route.query.tab
+    router.replace({ query: {} })
   }
 
   if (!authStore.currentUser) {
diff --git a/frontend/src/stores/api.js b/frontend/src/stores/api.js
index f227700..ebfc4dd 100644
--- a/frontend/src/stores/api.js
+++ b/frontend/src/stores/api.js
@@ -76,6 +76,23 @@ export const useAPIStore = defineStore('api', () => {
     return axios.get(`${API_BASE_URL}/games?${queryParams}`)
   }
 
+  // --- ADICIONADO: Função que faltava ---
+  const getCurrentUserGames = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+      ...(params.type && { type: params.type }),
+      ...(params.outcome && { outcome: params.outcome }),
+      ...(params.status && { status: params.status }),
+      ...(params.date_from && { date_from: params.date_from }),
+      ...(params.date_to && { date_to: params.date_to }),
+      sort_by: params.sort_by || 'began_at',
+      sort_direction: params.sort_direction || 'desc',
+    }).toString()
+
+    return axios.get(`${API_BASE_URL}/users/${authStore.currentUserID}/games?${queryParams}`)
+  }
+  // --------------------------------------
+
   const getCurrentUserMatches = (params = {}) => {
     const queryParams = new URLSearchParams({
       page: params.page || 1,
@@ -157,19 +174,34 @@ export const useAPIStore = defineStore('api', () => {
       ...(params.sort_direction == 'asc' && { sort_direction: 'asc' }),
       ...(params.type && { type: params.type }),
     }).toString()
+    
     return axios.get(`${API_BASE_URL}/games?${queryParams}`)
   }
 
+  const getAdminMatches = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+      ...(params.type && { type: params.type }),
+      ...(params.outcome && { outcome: params.outcome }),
+      ...(params.date_from && { date_from: params.date_from }),
+      ...(params.date_to && { date_to: params.date_to }),
+      sort_by: params.sort_by || 'began_at',
+      sort_direction: params.sort_direction || 'desc',
+    }).toString()
+
+    return axios.get(`${API_BASE_URL}/matches?${queryParams}`)
+  }
+
   const postAdmin = async (credentials) => {
     return axios.post(`${API_BASE_URL}/admin/users`, credentials)
   }
 
-
   return {
     postLogin,
     postLogout,
     getAuthUser,
     getGames,
+    getCurrentUserGames,
     getCurrentUserMatches,
     getCurrentUserTransactions,
     getCurrentUserStats,
@@ -182,6 +214,7 @@ export const useAPIStore = defineStore('api', () => {
     deleteUser,
     getAdminTransactions,
     getAdminGames,
+    getAdminMatches,
     postAdmin,
     gameQueryParameters,
   }
diff --git a/websockets/classes/BiscaGame.js b/websockets/classes/BiscaGame.js
index 8ee957b..6542894 100644
--- a/websockets/classes/BiscaGame.js
+++ b/websockets/classes/BiscaGame.js
@@ -1,7 +1,9 @@
 class BiscaGame {
-  constructor(id, type, player1, player2) {
+  constructor(id, type, player1, player2, dbId = null, onGameEnd = null) {
     this.id = id;
+    this.dbId = dbId;
     this.type = type;
+    this.onGameEnd = onGameEnd;
 
     this.deck = [];
     this.trumpCard = null;
@@ -17,7 +19,7 @@ class BiscaGame {
     };
 
     this.currentTurn = null;
-    this.status = 'pending';
+    this.status = "pending";
     this.startTime = null;
 
     this.players = {
@@ -50,7 +52,7 @@ class BiscaGame {
     this.currentTurn = playerIds.find((id) => id != 1) || playerIds[0];
 
     this.startTime = Date.now();
-    this.status = 'playing';
+    this.status = "playing";
   }
 
   startTurnTimer(callback) {
@@ -75,7 +77,7 @@ class BiscaGame {
 
   handleTimeout() {
     console.log(
-      `[Game ${this.id}] Timeout! Auto-playing for ${this.currentTurn}`,
+      `[Game ${this.id}] Timeout! Auto-playing for ${this.currentTurn}`
     );
 
     const lowestCard = this.getLowestCard(this.currentTurn);
@@ -94,7 +96,7 @@ class BiscaGame {
   }
 
   createDeck() {
-    const suits = ['c', 'e', 'o', 'p'];
+    const suits = ["c", "e", "o", "p"];
     const ranks = [1, 2, 3, 4, 5, 6, 7, 11, 12, 13];
     let deck = [];
 
@@ -130,7 +132,7 @@ class BiscaGame {
   }
 
   playCard(userId, cardId) {
-    if (this.currentTurn != userId) return { error: 'Not your turn!' };
+    if (this.currentTurn != userId) return { error: "Not your turn!" };
 
     const player = this.players[userId];
     const cardIndex = player.hand.findIndex((c) => c.id === cardId);
@@ -144,7 +146,7 @@ class BiscaGame {
       const suitToFollow = this.table.playerCard.suit;
       const hasSuit = player.hand.some((c) => c.suit === suitToFollow);
       if (hasSuit && card.suit !== suitToFollow) {
-        return { error: 'You must follow the suit!' };
+        return { error: "You must follow the suit!" };
       }
     }
 
@@ -156,7 +158,7 @@ class BiscaGame {
       this.table.playerCard = card;
       this.table.firstPlayerId = userId;
       this.currentTurn = this.getOpponentId(userId);
-      return { action: 'next_turn' };
+      return { action: "next_turn" };
     } else {
       this.table.opponentCard = card;
       return this.resolveTrick();
@@ -196,7 +198,7 @@ class BiscaGame {
     this.table = { playerCard: null, opponentCard: null, firstPlayerId: null };
 
     if (this.players[winnerId].hand.length === 0) {
-      this.status = 'finished';
+      this.status = "finished";
       this.stopTimer();
 
       const pIds = Object.keys(this.players);
@@ -216,11 +218,11 @@ class BiscaGame {
       const finalLoser = isDraw
         ? null
         : gameWinnerId == p1Obj.id
-          ? p2Obj.id
-          : p1Obj.id;
+        ? p2Obj.id
+        : p1Obj.id;
 
       return {
-        action: 'game_ended',
+        action: "game_ended",
         trickResult,
         winnerId: finalWinner,
         loserId: finalLoser,
@@ -231,15 +233,20 @@ class BiscaGame {
         player2_points: p2Obj.points,
         totalTime: totalTime,
       };
+      if (this.onGameEnd) {
+        this.onGameEnd(result);
+      }
+      return result;
     }
 
-    return { action: 'trick_resolved', trickResult };
+    return { action: "trick_resolved", trickResult };
   }
 
   getStateForPlayer(userId) {
     const oppId = this.getOpponentId(userId);
     return {
       id: this.id,
+      dbId: this.dbId,
       trumpCard: this.trumpCard,
       trumpSuit: this.trumpSuit,
       deckCount: this.deck.length + (this.trumpCard ? 1 : 0),
diff --git a/websockets/classes/BiscaMatch.js b/websockets/classes/BiscaMatch.js
new file mode 100644
index 0000000..891c8dd
--- /dev/null
+++ b/websockets/classes/BiscaMatch.js
@@ -0,0 +1,275 @@
+import BiscaGame from "../classes/BiscaGame.js";
+import axios from "axios";
+
+const API_URL = "http://localhost:8000/api/v1";
+
+class BiscaMatch {
+  constructor(apiData, emitStateCallback, token) {
+    this.id = apiData.id;
+    this.emitStateCallback = emitStateCallback;
+    this.token = token;
+    this.stake = apiData.stake;
+    this.type = apiData.type;
+    this.status = apiData.status;
+
+    this.player1Id = apiData.player1_user_id;
+    this.player2Id = apiData.player2_user_id;
+
+    this.marks = {
+      [this.player1Id]: apiData.player1_marks || 0,
+      [this.player2Id]: apiData.player2_marks || 0,
+    };
+
+    this.points = {
+      [this.player1Id]: apiData.player1_points || 0,
+      [this.player2Id]: apiData.player2_points || 0,
+    };
+
+    this.currentGame = null;
+    this.GHOST_ID = 1;
+
+    if (this.status === "Playing" && this.player2Id !== this.GHOST_ID) {
+      this.startNewGame();
+    }
+  }
+
+  async joinPlayer(userId) {
+    if (this.player2Id !== this.GHOST_ID) return false;
+    if (userId === this.player1Id) return false;
+
+    this.player2Id = userId;
+    this.marks[userId] = 0;
+    this.points[userId] = 0;
+    this.status = "Playing";
+
+    await this.startNewGame();
+    return true;
+  }
+
+  getAuthHeaders() {
+    return {
+      headers: { Authorization: this.token },
+    };
+  }
+
+  async startNewGame() {
+    console.log(`[Match ${this.id}] A iniciar nova mão (Game DB)...`);
+
+    let newGameDbId = null;
+
+    try {
+      let payloadP1 = this.player1Id;
+      let payloadP2 = this.player2Id;
+
+      if (this.player2Id !== this.GHOST_ID) {
+        console.log(
+          "🔄 Multiplayer detetado: Trocando ordem para satisfazer a API..."
+        );
+        payloadP1 = this.player2Id;
+        payloadP2 = this.player1Id;
+      }
+
+      const payload = {
+        type: this.type,
+        player1_user_id: payloadP1,
+        player2_user_id: payloadP2,
+        match_id: this.id,
+        status: "Playing",
+        began_at: new Date().toISOString(),
+      };
+
+      console.log("📤 [Payload Adaptado]:", JSON.stringify(payload, null, 2));
+
+      const res = await axios.post(
+        `${API_URL}/games`,
+        payload,
+        this.getAuthHeaders()
+      );
+
+      const gameData = res.data.game || res.data.data || res.data;
+      newGameDbId = gameData.id;
+
+      console.log(`[Match ${this.id}] Game DB criado: #${newGameDbId}`);
+
+      const apiP1 = gameData.player1_user_id;
+      const apiP2 = gameData.player2_user_id;
+
+      const p1 = { id: apiP1, name: `User ${apiP1}` };
+      const p2 = { id: apiP2, name: `User ${apiP2}` };
+
+      this.currentGame = new BiscaGame(
+        this.id,
+        this.type,
+        p1,
+        p2,
+        newGameDbId,
+        (result) => {
+          this.handleGameEnd(result);
+        }
+      );
+
+      this.currentGame.init();
+
+      if (this.emitStateCallback) {
+        this.emitStateCallback("match:new-round", this.getState());
+      }
+    } catch (e) {
+      if (e.response) {
+        console.error(
+          `❌ Erro API (${e.response.status}):`,
+          JSON.stringify(e.response.data)
+        );
+      } else {
+        console.error(`❌ Erro Código: ${e.message}`);
+      }
+    }
+  }
+
+  async handleGameEnd(result) {
+    console.log(
+      `[Match ${this.id}] Mão terminada. Vencedor: ${result.winnerId}`
+    );
+
+    this.points[result.player1_id] += result.player1_points;
+    this.points[result.player2_id] += result.player2_points;
+
+    if (this.currentGame && this.currentGame.dbId) {
+      try {
+        const payload = {
+          status: "Ended",
+          winner_user_id: result.winnerId,
+          loser_user_id: result.loserId,
+          is_draw: result.isDraw,
+          player1_points: result.player1_points,
+          player2_points: result.player2_points,
+          ended_at: new Date().toISOString(),
+        };
+
+        console.log(
+          `📤 A enviar update para Game #${this.currentGame.dbId}...`
+        );
+
+        // --- CORREÇÃO IMPORTANTE: Forçar o header aqui ---
+        const config = {
+          headers: {
+            Authorization: this.token,
+            "Content-Type": "application/json",
+            Accept: "application/json",
+          },
+        };
+
+        await axios.put(
+          `${API_URL}/games/${this.currentGame.dbId}`,
+          payload,
+          config
+        );
+
+        console.log(
+          `✅ Game #${this.currentGame.dbId} atualizado com sucesso.`
+        );
+      } catch (e) {
+        // --- LOG DETALHADO PARA VER O MOTIVO DO 403 ---
+        if (e.response) {
+          console.error(`❌ ERRO CRÍTICO API (${e.response.status}):`);
+          // Isto vai imprimir o JSON exato que o Laravel devolve
+          console.error(JSON.stringify(e.response.data, null, 2));
+        } else {
+          console.error("Erro Axios:", e.message);
+        }
+      }
+    } else {
+      console.warn("⚠️ Ignorado: Não há ID de jogo na DB para atualizar.");
+    }
+
+    // ... (resto da lógica de atribuir marcas e finishMatch mantém-se igual)
+    let marksToAdd = 0;
+    let roundWinnerId = result.winnerId;
+
+    if (roundWinnerId) {
+      const winningScore =
+        roundWinnerId == result.player1_id
+          ? result.player1_points
+          : result.player2_points;
+      if (winningScore === 120) marksToAdd = 4;
+      else if (winningScore > 90) marksToAdd = 2;
+      else if (winningScore >= 60) marksToAdd = 1;
+      this.marks[roundWinnerId] += marksToAdd;
+    }
+
+    if (this.marks[this.player1Id] >= 4 || this.marks[this.player2Id] >= 4) {
+      await this.finishMatch();
+      if (this.emitStateCallback) {
+        this.emitStateCallback("match:ended", this.getState());
+      }
+    } else {
+      console.log(`[Match ${this.id}] Ninguém ganhou 4 marcas. A baralhar...`);
+      await this.startNewGame();
+    }
+  }
+
+  async finishMatch() {
+    this.status = "Ended";
+
+    const winnerId =
+      this.marks[this.player1Id] >= 4 ? this.player1Id : this.player2Id;
+    const loserId =
+      winnerId == this.player1Id ? this.player2Id : this.player1Id;
+
+    try {
+      await axios.put(
+        `${API_URL}/matches/${this.id}`,
+        {
+          status: "Ended",
+          winner_user_id: winnerId,
+          loser_user_id: loserId,
+          player1_marks: this.marks[this.player1Id],
+          player2_marks: this.marks[this.player2Id],
+          player1_points: this.points[this.player1Id],
+          player2_points: this.points[this.player2Id],
+        },
+        this.getAuthHeaders()
+      );
+      console.log(`[Match ${this.id}] Encerrado com sucesso na API.`);
+    } catch (e) {
+      console.error(`Erro ao fechar Match API: ${e.message}`);
+    }
+  }
+
+  playCard(userId, cardId) {
+    if (!this.currentGame || this.status !== "Playing") return;
+    return this.currentGame.playCard(userId, cardId);
+  }
+
+  getState() {
+    let gameState = null;
+
+    if (this.currentGame) {
+      const p1Id = this.player1Id;
+      const p2Id = this.player2Id;
+
+      if (this.currentGame.players && this.currentGame.players[p1Id]) {
+        gameState = this.currentGame.getStateForPlayer(p1Id);
+      } else if (this.currentGame.players && this.currentGame.players[p2Id]) {
+        gameState = this.currentGame.getStateForPlayer(p2Id);
+      } else if (this.currentGame.players) {
+        const availableIds = Object.keys(this.currentGame.players);
+        if (availableIds.length > 0) {
+          console.warn(
+            `⚠️ [Match ${this.id}] IDs desalinhados! A usar vista do user ${availableIds[0]}`
+          );
+          gameState = this.currentGame.getStateForPlayer(availableIds[0]);
+        }
+      }
+    }
+
+    return {
+      matchId: this.id,
+      status: this.status,
+      marks: this.marks,
+      points: this.points,
+      game: gameState,
+    };
+  }
+}
+
+export default BiscaMatch;
diff --git a/websockets/events/connection.js b/websockets/events/connection.js
index 49d78a1..bc87427 100644
--- a/websockets/events/connection.js
+++ b/websockets/events/connection.js
@@ -1,6 +1,5 @@
 import { addUser, removeUser } from "../state/connection.js";
 
-
 const HEARTBEAT_INTERVAL = 30000; // 30 seconds
 const HEARTBEAT_TIMEOUT = 10000; // 10 seconds
 
@@ -9,36 +8,36 @@ export const handleConnectionEvents = (io, socket) => {
   let heartbeatTimeout;
   const startHeartbeat = () => {
     heartbeatInterval = setInterval(() => {
-      socket.emit('heartbeat');
+      socket.emit("heartbeat");
 
       heartbeatTimeout = setTimeout(() => {
         console.log(
-          `[Heartbeat] No response from ${socket.id}, disconnecting...`,
+          `[Heartbeat] No response from ${socket.id}, disconnecting...`
         );
         socket.disconnect(true);
       }, HEARTBEAT_TIMEOUT);
     }, HEARTBEAT_INTERVAL);
   };
 
-  socket.on('heartbeat_ack', () => {
+  socket.on("heartbeat_ack", () => {
     clearTimeout(heartbeatTimeout);
     console.log(`[Heartbeat] Received pong from ${socket.id}`);
   });
 
-  socket.on('join', (user) => {
+  socket.on("join", (user) => {
     addUser(socket, user);
     console.log(`[Connection] User ${user.name} has joined the server`);
   });
 
-  socket.on('leave', () => {
+  socket.on("leave", () => {
     const user = removeUser(socket.id);
     if (user) {
       console.log(`[Connection] User ${user.name} has left the server`);
     }
   });
 
-  socket.on('disconnect', () => {
-    console.log('Connection Lost:', socket.id);
+  socket.on("disconnect", () => {
+    console.log("Connection Lost:", socket.id);
     removeUser(socket.id);
   });
 };
diff --git a/websockets/events/match.js b/websockets/events/match.js
new file mode 100644
index 0000000..7cff0a7
--- /dev/null
+++ b/websockets/events/match.js
@@ -0,0 +1,138 @@
+import { getMatch, addMatch } from "../state/match.js";
+import BiscaMatch from "../classes/BiscaMatch.js";
+import axios from "axios";
+
+const API_URL = "http://localhost:8000/api/v1";
+
+export default (io, socket) => {
+  const createMatchEmitter = (matchId) => (eventName, payload) => {
+    io.to(`match_${matchId}`).emit(eventName, payload);
+  };
+
+  socket.on("match:enter", async (data) => {
+    const { matchId } = data;
+
+    if (!socket.user || !socket.user.id) {
+      return socket.emit("error", { message: "User not authenticated" });
+    }
+
+    const userId = socket.user.id;
+    const room = `match_${matchId}`;
+
+    let match = getMatch(matchId);
+
+    if (!match) {
+      try {
+        console.log(`A pedir match ${matchId} à API...`);
+        const res = await axios.get(`${API_URL}/matches/${matchId}`, {
+          headers: { Authorization: socket.token },
+        });
+
+        const matchData = res.data.data || res.data;
+
+        match = new BiscaMatch(
+          matchData,
+          createMatchEmitter(matchId),
+          socket.token
+        );
+        addMatch(match);
+        console.log(`Match ${matchId} carregado em memória.`);
+      } catch (e) {
+        console.error("Erro ao carregar Match da API:", e.message);
+        socket.emit("error", "Match not found or API error");
+        return;
+      }
+    } else {
+      match.token = socket.token;
+    }
+
+    if (match) {
+      match.token = socket.token;
+    }
+
+    match.emitStateCallback = createMatchEmitter(matchId);
+
+    if (userId !== match.player1Id && match.player2Id === 1) {
+      console.log(`User ${userId} a substituir o Ghost no Match ${matchId}`);
+      await match.joinPlayer(userId);
+    }
+
+    socket.join(room);
+    console.log(`Socket ${socket.id} entrou na sala ${room}`);
+
+    if (match.status === "Playing") {
+      socket.emit("match:update", match.getState());
+    } else {
+      socket.emit("match:waiting", { msg: "Waiting for opponent..." });
+    }
+  });
+
+  socket.on("game:play-card", (data) => {
+    const { matchId, cardId } = data;
+    const match = getMatch(matchId);
+
+    if (!match || match.status !== "Playing") {
+      console.log(
+        "Tentativa de jogar sem match ativo ou match não encontrado."
+      );
+      return;
+    }
+
+    const result = match.playCard(socket.user.id, cardId);
+
+    if (result && result.error) {
+      console.log(
+        `❌ [Erro Jogo] User ${socket.user.id} tentou jogar carta ${cardId} mas: ${result.error}`
+      );
+
+      socket.emit("error", { message: result.error });
+      return;
+    }
+
+    if (match.currentGame) {
+      io.to(`match_${matchId}`).emit(
+        "game:update",
+        match.currentGame.getStateForPlayer(socket.user.id)
+      );
+    }
+  });
+  socket.on("debug:end-game", async (data) => {
+    const { matchId } = data;
+    const match = getMatch(matchId);
+    if (match) {
+      console.log(`[DEBUG] User ${socket.user.id} a forçar fim de jogo.`);
+      // Simula que o user que clicou ganhou 120 pontos
+      const winnerId = socket.user.id;
+      const loserId =
+        winnerId == match.player1Id ? match.player2Id : match.player1Id;
+
+      // Objeto de resultado falso para fechar o jogo
+      const fakeResult = {
+        winnerId: winnerId,
+        loserId: loserId,
+        isDraw: false,
+        player1_points: winnerId == match.player1Id ? 120 : 0,
+        player2_points: winnerId == match.player2Id ? 120 : 0,
+        player1_id: match.player1Id,
+        player2_id: match.player2Id,
+      };
+
+      await match.handleGameEnd(fakeResult);
+    }
+  });
+
+  // DEBUG: Forçar fim do Match Completo
+  socket.on("debug:end-match", async (data) => {
+    const { matchId } = data;
+    const match = getMatch(matchId);
+    if (match) {
+      console.log(`[DEBUG] User ${socket.user.id} a forçar fim de MATCH.`);
+      // Dá 4 marcas a quem clicou
+      match.marks[socket.user.id] = 4;
+      await match.finishMatch();
+
+      // Emite o estado final
+      io.to(`match_${matchId}`).emit("match:ended", match.getState());
+    }
+  });
+};
diff --git a/websockets/server.js b/websockets/server.js
index fc756a7..a897102 100644
--- a/websockets/server.js
+++ b/websockets/server.js
@@ -3,6 +3,7 @@ import axios from "axios";
 import { handleConnectionEvents } from "./events/connection.js";
 import { addUser, removeUser } from "./state/connection.js";
 import gameEvents from "./events/game.js";
+import matchEvents from "./events/match.js";
 
 export const server = {
   io: null,
@@ -46,6 +47,7 @@ export const serverStart = (port) => {
       }
 
       socket.user = user;
+      socket.token = token;
       socket.handshake.auth.token = token; 
 
       if (disconnectTimers.has(user.id)) {
@@ -75,7 +77,9 @@ export const serverStart = (port) => {
     gameEvents(server.io, socket);
     console.log(`[Connection] User ${userId} connected. Socket ID: ${socket.id}`);
 
-    handleConnectionEvents(socket);
+    matchEvents(server.io, socket);
+
+    handleConnectionEvents(server.io, socket);
 
     socket.on("disconnect", () => {
       // Remove from active socket list
diff --git a/websockets/state/game.js b/websockets/state/game.js
index 372876a..899351b 100644
--- a/websockets/state/game.js
+++ b/websockets/state/game.js
@@ -1,36 +1,37 @@
-import BiscaGame from '../classes/BiscaGame.js';
+import BiscaGame from "../classes/BiscaGame.js";
 
 const activeGames = new Map();
 
-const createGame = (id, type, player1, player2) => {
-    const existingGame = activeGames.get(id);
-    if (existingGame) {
-        console.log(
-            `[Game State] Game ${id} already exists, returning existing instance`,
-        );
-        return existingGame;
-    }
-    const game = new BiscaGame(id, type, player1, player2);
+export const createGame = (id, type, player1, player2) => {
+  const existingGame = activeGames.get(id);
+  if (existingGame) {
+    console.log(
+      `[Game State] Game ${id} already exists, returning existing instance`
+    );
+    return existingGame;
+  }
+  const game = new BiscaGame(id, type, player1, player2);
 
-    game.init();
+  game.init();
 
-    activeGames.set(id, game);
+  activeGames.set(id, game);
 
-    console.log(`[Game State] Game created: ${id} (Type: ${type})`);
-    return game;
+  console.log(`[Game State] Game created: ${id} (Type: ${type})`);
+  return game;
 };
 
-const getGame = (id) => {
-    return activeGames.get(id);
+export const getGame = (id) => {
+  return activeGames.get(id);
 };
 
-const removeGame = (id) => {
-    const game = activeGames.get(id);
-    if (game) {
-        game.stopTimer();
-        activeGames.delete(id);
-        console.log(`[Game State] Game removed: ${id}`);
-    }
+export const removeGame = (id) => {
+  const game = activeGames.get(id);
+  if (game) {
+    game.stopTimer();
+    activeGames.delete(id);
+    console.log(`[Game State] Game removed: ${id}`);
+  }
 };
 
 export { createGame, getGame, removeGame };
+
diff --git a/websockets/state/match.js b/websockets/state/match.js
new file mode 100644
index 0000000..241d992
--- /dev/null
+++ b/websockets/state/match.js
@@ -0,0 +1,16 @@
+const matches = new Map();
+
+export const addMatch = (match) => {
+  matches.set(parseInt(match.id), match);
+  return match;
+};
+
+export const getMatch = (id) => {
+  return matches.get(parseInt(id));
+};
+
+export const removeMatch = (id) => {
+  matches.delete(parseInt(id));
+};
+
+export { matches };