fix:websocket errors & polict change

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/91
Reviewed-by: FernandoJVideira <[email protected]>
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>

api/app/Http/Controllers/CoinPurchaseController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\CoinPurchase;
+use App\Models\CoinTransaction;
+use App\Models\CoinTransactionType;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CoinPurchaseController extends Controller
+{
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'euros' => 'required|numeric|min:1|max:100',
+            'payment_type' => 'required|in:MBWAY,MB,VISA,PAYPAL',
+            'payment_reference' => [
+                'required',
+                function ($attribute, $value, $fail) use ($request) {
+                    $type = $request->payment_type;
+                    $regex = null;
+
+                    switch ($type) {
+                        case 'MBWAY': $regex = '/^9[0-9]{8}$/'; break;
+                        case 'MB':    $regex = '/^[0-9]{5}-[0-9]{9}$/'; break;
+                        case 'VISA':  $regex = '/^4[0-9]{15}$/'; break;
+                        case 'PAYPAL':
+                            if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
+                                $fail("Invalid PayPal email.");
+                            }
+                            return;
+                    }
+
+                    if ($regex && !preg_match($regex, $value)) {
+                        $fail("Invalid format for $type.");
+                    }
+                },
+            ],
+        ]);
+
+        $user = $request->user();
+        $coinsAmount = $validated['euros'] * 10; 
+
+        return DB::transaction(function () use ($user, $validated, $coinsAmount) {
+            
+            $type = CoinTransactionType::firstOrCreate(['name' => 'Coin purchase'], ['type' => 'C']);
+
+            $transaction = CoinTransaction::create([
+                'user_id' => $user->id,
+                'coin_transaction_type_id' => $type->id,
+                'transaction_datetime' => now(),
+                'coins' => $coinsAmount,
+            ]);
+
+            $purchase = CoinPurchase::create([
+                'purchase_datetime' => now(),
+                'user_id' => $user->id,
+                'coin_transaction_id' => $transaction->id,
+                'euros' => $validated['euros'],
+                'payment_type' => $validated['payment_type'],
+                'payment_reference' => $validated['payment_reference'],
+            ]);
+
+            $user->increment('coins_balance', $coinsAmount);
+
+            return response()->json([
+                'message' => 'Purchase successful',
+                'balance' => $user->coins_balance,
+                'transaction_id' => $transaction->id,
+                'purchase' => $purchase,
+            ], 201);
+        });
+    }
+}

api/app/Http/Controllers/GameController.php

@@ -4,9 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Game;
 use Illuminate\Http\Request;
-use App\Http\Requests\StoreGameRequest;
 use Illuminate\Support\Facades\Auth;
-use App\Models\MatchGame;
 
 class GameController extends Controller
 {

api/app/Http/Controllers/MatchController.php

@@ -4,9 +4,12 @@ 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
 {    
@@ -30,42 +33,59 @@ class MatchController extends Controller
     public function store(StoreMatchRequest $request)
     {        
         $validated = $request->validated();
-        $user = Auth::user();
+        $user = $request->user(); 
+        $stake = $validated['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();
 
-        $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 ($activeMatch || $activeGame) {
-            return response()->json(['message' => 'You already have an active game or match.'], 400);
+        if ($activeMatch) { 
+            return response()->json(['message' => 'You already have an active match.'], 400);
         }
 
+        return DB::transaction(function () use ($validated, $user, $stake) {
+            $GHOST_ID = 1;
+
+            $user->decrement('coins_balance', $stake);
+
+            $stakeType = CoinTransactionType::firstOrCreate(
+                ['name' => 'Match stake'],
+                ['type' => 'D'] // Debit
+            );
+
             $match = MatchGame::create([
                 'type' => $validated['type'],
                 'status' => 'Pending',
                 'player1_user_id' => $user->id,
-            'player2_user_id' => $user->id,
-            'winner_user_id' => $user->id,
-            'loser_user_id' => $user->id,
-            'stake' => $validated['stake'],
+                'player2_user_id' => $GHOST_ID, 
+                'winner_user_id' => $GHOST_ID,
+                'loser_user_id' => $GHOST_ID,
+                'stake' => $stake,
                 'began_at' => now(),
-            'player1_marks' => 0,
-            'player2_marks' => 0,
-            'player1_points' => 0,
-            'player2_points' => 0,
-            'custom' => null
+                '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([
                 'message' => 'Match created successfully',
-            'match' => $match
+                'match' => $match,
+                'balance' => $user->coins_balance
             ], 201);
+        });
     }
 
     public function show(MatchGame $match)
@@ -76,16 +96,19 @@ class MatchController extends Controller
 
     public function join(MatchGame $match)
     {
-        $user = Auth::user();
+        $user = request()->user();
 
         if ($match->player1_user_id == $user->id) {
-            return response()->json(['message' => 'Waiting for opponent...', 'match' => $match]);
+            return response()->json(['message' => 'You cannot join your own match'], 400);
         }
-
         if ($match->status !== 'Pending') {
             return response()->json(['message' => 'Match is full or started'], 400);
         }
 
+        if ($user->coins_balance < $match->stake) {
+            return response()->json(['message' => 'Insufficient coin balance to join this match'], 400);
+        }
+
         $activeMatch = MatchGame::where(function ($q) use ($user) {
             $q->where('player1_user_id', $user->id)
               ->orWhere('player2_user_id', $user->id);
@@ -95,6 +118,22 @@ class MatchController extends Controller
              return response()->json(['message' => 'You are already in another active match.'], 400);
         }
 
+        return DB::transaction(function () use ($match, $user) {
+            $user->decrement('coins_balance', $match->stake);
+
+            $stakeType = CoinTransactionType::firstOrCreate(
+                ['name' => 'Match stake'],
+                ['type' => 'D']
+            );
+
+            CoinTransaction::create([
+                'user_id' => $user->id,
+                'match_id' => $match->id,
+                'coin_transaction_type_id' => $stakeType->id,
+                'transaction_datetime' => now(),
+                'coins' => -$match->stake, 
+            ]);
+
             $match->update([
                 'status' => 'Playing',
                 'player2_user_id' => $user->id
@@ -102,8 +141,10 @@ class MatchController extends Controller
 
             return response()->json([
                 'message' => 'Joined match successfully!',
-            'match' => $match
+                'match' => $match,
+                'balance' => $user->coins_balance
             ]);
+        });
     }
 
     public function update(Request $request, MatchGame $match)
@@ -123,12 +164,36 @@ class MatchController extends Controller
             'total_time' => 'numeric'
         ]);
 
+        return DB::transaction(function () use ($match, $data) {
+            
             if (isset($data['status']) && $data['status'] === 'Ended') {
                 $data['ended_at'] = now();
             }
 
             $match->update($data);
 
+            if ($match->status === 'Ended' && $match->stake > 0 && $match->winner_user_id) {
+                
+                $payoutType = CoinTransactionType::firstOrCreate(
+                    ['name' => 'Match payout'],
+                    ['type' => 'C'] // Credit
+                );
+
+                $totalPrize = $match->stake * 2;
+
+                CoinTransaction::create([
+                    'user_id' => $match->winner_user_id,
+                    'match_id' => $match->id,
+                    'coin_transaction_type_id' => $payoutType->id,
+                    'transaction_datetime' => now(),
+                    'coins' => $totalPrize,
+                ]);
+
+
+                $match->winner->increment('coins_balance', $totalPrize);
+            }
+
             return response()->json($match);
+        });
     }
 }

api/app/Http/Controllers/StatisticsController.php

@@ -29,16 +29,23 @@ class StatisticsController extends Controller
     {
         $type = $request->query('type');
 
-        $query = User::where('type', 'P')
+        $leaderboard = User::where('type', 'P')
             ->withCount(['wonGames' => function ($query) use ($type) {
                 if ($type) {
                     $query->where('type', $type);
                 }
             }])
             ->orderBy('won_games_count', 'desc')
-            ->take(10);
+            ->paginate(10);
 
-        $leaderboard = $query->get(['id', 'nickname', 'photo_avatar_filename']);
+        $leaderboard->through(function ($user) {
+            return [
+                'id' => $user->id,
+                'nickname' => $user->nickname,
+                'photo_avatar_filename' => $user->photo_avatar_filename,
+                'won_games_count' => $user->won_games_count,
+            ];
+        });
 
         return response()->json($leaderboard);
     }

api/app/Http/Controllers/UserController.php

@@ -183,15 +183,64 @@ class UserController extends Controller
     {
         $this->authorize('view', $user);
 
-        $matches = Game::query()
+        $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,
-                );
+            $q->where('player1_user_id', $user->id)
+              ->orWhere('player2_user_id', $user->id);
         })
-            ->with(['winner', 'player1', 'player2'])
-            ->orderBy('began_at', 'desc')
+        ->with(['winner', 'player1', 'player2']);
+
+        if ($request->has('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;
+        }
+    }
+
+        if ($request->has('date_from')) {
+            $query->whereDate('began_at', '>=', $request->date_from);
+        }
+
+        if ($request->has('date_to')) {
+            $query->whereDate('ended_at', '<=', $request->date_to);
+        }
+
+        $order = $request->get('sort_by', 'began_at');
+        $direction = $request->get('sort_direction', 'desc');
+
+        if ($order === 'outcome') {
+            $query->orderBy('outcome_text', $direction);
+        } else {
+            $query->orderBy($order, $direction);
+        }
+
+        $matches = $query->orderBy($order, $direction)
                               ->paginate(10);
 
         return response()->json($matches);
@@ -230,7 +279,7 @@ class UserController extends Controller
 
         if ($request->has('type')) {
             $query->whereHas('type', function ($q) use ($request) {
-                $q->where('name', $request->type);
+                $q->where('type', $request->type);
             });
         }
 

api/app/Models/CoinPurchase.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CoinPurchase extends Model
+{
+    use HasFactory;
+    
+    protected $table = 'coin_purchases';
+    public $timestamps = false;
+
+    protected $fillable = [
+        'purchase_datetime',
+        'user_id',
+        'coin_transaction_id',
+        'euros',
+        'payment_type',
+        'payment_reference',
+        'custom'
+    ];
+
+    protected $casts = [
+        'purchase_datetime' => 'datetime',
+        'custom' => 'array',
+    ];
+
+    public function transaction()
+    {
+        return $this->belongsTo(CoinTransaction::class, 'coin_transaction_id');
+    }
+}

api/app/Policies/GamePolicy.php

@@ -20,7 +20,7 @@ class GamePolicy
      */
     public function view(User $user, Game $game): bool
     {
-        if ($user->type === 'A') {
+        if ($user->type === "A") {
             return true;
         }
 
@@ -31,6 +31,10 @@ class GamePolicy
             return true;
         }
 
+        if ($game->status === "Pending") {
+            return true;
+        }
+
         return false;
     }
 
@@ -39,7 +43,7 @@ class GamePolicy
      */
     public function create(User $user): bool
     {
-        if ($user->type === 'A') {
+        if ($user->type === "A") {
             return false;
         }
 
@@ -48,28 +52,32 @@ class GamePolicy
 
     public function join(User $user, Game $game): bool
     {
-        if ($user->type === 'A') {
+        if ($user->type === "A") {
             return false;
         }
 
         if (
-            $game->status !== 'waiting' ||
+            $game->status !== "Pending" ||
             $game->player1_user_id === $user->id
         ) {
             return false;
         }
 
+        if ($game->player2_user_id !== null && $game->player2_user_id !== 1) {
+            return false;
+        }
+
         return true;
     }
 
     public function resign(User $user, Game $game): bool
     {
-        if ($user->type === 'A') {
+        if ($user->type === "A") {
             return false;
         }
 
         if (
-            $game->status !== 'ongoing' ||
+            $game->status !== "Playing" ||
             ($game->player1_user_id !== $user->id &&
                 $game->player2_user_id !== $user->id)
         ) {
@@ -84,12 +92,12 @@ class GamePolicy
      */
     public function update(User $user, Game $game): bool
     {
-        if ($user->type === 'A') {
+        if ($user->type === "A") {
             return false;
         }
 
         if (
-            $game->status !== 'ongoing' ||
+            $game->status !== "Playing" ||
             ($game->player1_user_id !== $user->id &&
                 $game->player2_user_id !== $user->id)
         ) {
@@ -105,7 +113,7 @@ class GamePolicy
     public function delete(User $user, Game $game): bool
     {
         // Only admins can delete games
-        return $user->type === 'A';
+        return $user->type === "A";
     }
 
     /**

api/routes/api.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\MatchController;
 use App\Http\Controllers\ProfileController;
 use App\Http\Controllers\StatisticsController;
 use App\Http\Controllers\UserController;
+use App\Http\Controllers\CoinPurchaseController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1')->group(function () {
@@ -19,6 +20,7 @@ Route::prefix('v1')->group(function () {
     // Authenticated Routes
     Route::middleware(['auth:sanctum', 'throttle:60,1'])->group(function () {
         Route::post('/logout', [AuthController::class, 'logout']);
+        Route::post('/coin-purchases', [CoinPurchaseController::class, 'store']);
         Route::get('/statistics/me', [StatisticsController::class, 'getPersonalStats']);
         Route::prefix('users/me')->group(function () {
             Route::get('/', [ProfileController::class, 'show']);

api/sample-requests.http

@@ -25,8 +25,43 @@ Content-Type: application/json
 Accept: application/json
 Authorization: Bearer {{token}}
 
+### Get me coins
+GET http://localhost:8000/api/v1/users/me/coins
+Content-Type: application/json
+Accept: application/json
+Authorization: Bearer {{token}}
+
 ### Get me matches
 GET http://localhost:8000/api/v1/users/{{id}}/matches
 Content-Type: application/json
 Accept: application/json
 Authorization: Bearer {{token}}
+
+### Get me transactions
+GET http://localhost:8000/api/v1/users/{{id}}/transactions?type=C
+Content-Type: application/json
+Accept: application/json
+Authorization: Bearer {{token}}
+
+### post coin-purchases
+POST http://localhost:8000/api/v1/coin-purchases
+Content-Type: application/json
+Accept: application/json
+Authorization: Bearer {{token}}
+
+{
+    "euros": 1,
+    "payment_type": "MBWAY",
+    "payment_reference": "912345678"
+}
+
+### Get public stats
+GET http://localhost:8000/api/v1/leaderboard
+Content-Type: application/json
+Accept: application/json
+
+### Get me stats
+GET http://localhost:8000/api/v1/statistics/me
+Content-Type: application/json
+Accept: application/json
+Authorization: Bearer {{token}}

bruno_collection/Games/Create Game.bru

@@ -0,0 +1,15 @@
+meta {
+  name: Create Game
+  type: http
+  seq: 3
+}
+
+post {
+  url: {{api_url}}/games
+  body: none
+  auth: inherit
+}
+
+settings {
+  encodeUrl: true
+}

frontend/src/components/layout/NavBar.vue

@@ -23,14 +23,14 @@
                 </NavigationMenuItem>
 
                 <NavigationMenuItem v-else class="flex flex-row gap-4">
-                    <NavigationMenuLink v-if="coins > 0" href="/user?tab=transaction-history"
+                    <NavigationMenuLink v-if="userStore.coins > 0" href="/coins-purchase"
                         class="flex flex-row items-center gap-1">
                         <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-sm font-medium tabular-nums">
-                            {{ coins }} <span class="text-muted-foreground text-xs">Coins</span>
+                            {{ userStore.coins }} <span class="text-muted-foreground text-xs">Coins</span>
                         </span>
                     </NavigationMenuLink>
                     <NavigationMenuLink>
@@ -56,13 +56,12 @@ import {
     NavigationMenuTrigger,
 } from '@/components/ui/navigation-menu'
 import router from '@/router';
-import { ref, watch } from 'vue';
+import { watch } from 'vue';
 import { useUserStore } from '@/stores/user';
 
 
 const emits = defineEmits(['logout'])
 const { userLoggedIn } = defineProps(['userLoggedIn'])
-const coins = ref(0);
 
 const biscaStore = useBiscaStore()
 
@@ -84,22 +83,13 @@ const logoutClickHandler = () => {
     router.push('/login')
 }
 
-const fetchUserCoins = async () => {
-    if (userLoggedIn) {
-        try {
-            const response = await useUserStore().getCoins()
-            coins.value = response.data?.coins || 0
-        } catch (error) {
-            console.error('Error fetching user coins', error)
-        }
-    }
-}
+const userStore = useUserStore()
 
 watch(() => userLoggedIn, async (isLoggedIn) => {
     if (isLoggedIn) {
-        await fetchUserCoins()
+        await userStore.fetchCoins()
     } else {
-        coins.value = 0
+        userStore.coins = 0
     }
 }, { immediate: true })
 </script>

frontend/src/pages/home/HomePage.vue

@@ -1,5 +1,6 @@
 <script setup>
-import { ref, onMounted, nextTick } from 'vue'
+import { User, Trophy } from 'lucide-vue-next'
+import { ref, onMounted, nextTick, inject } from 'vue'
 import { Button } from '@/components/ui/button'
 import {
     Card,
@@ -10,40 +11,51 @@ import {
 } from '@/components/ui/card'
 import { useAPIStore } from '@/stores/api'
 import { useRouter } from 'vue-router'
+import { useAuthStore } from '@/stores/auth'
 
+const API_BASE_URL = inject('apiBaseURL')
 const apiStore = useAPIStore()
 const router = useRouter()
 const openGames = ref([])
 const selectedMode = ref('9')
-const observerTarget = ref(null);
-const observer = ref(null);
-const isLoading = ref(false);
-const pageCounter = ref(1);
+const gObserverTarget = ref(null);
+const gObserver = ref(null);
+const gLoading = ref(false);
+const gPage = ref(1);
 const showHostModal = ref(false)
 const showJoinModal = ref(false)
 const selectedGame = ref(null)
 const isReady = ref(false)
+const showLeaderboardModal = ref(false)
+const showStatsModal = ref(false)
+const userStats = ref(null)
+const statsLoading = ref(false)
+const leaderboardEntries = ref([])
+const lbLoading = ref(false)
+const lbPage = ref(1)
+const lbObserverTarget = ref(null)
+const lbObserver = ref(null)
+const lbMorePages = ref(true)
 
-const setupObserver = () => {
-    if (observer.value) observer.value.disconnect();
+const setupGamesObserver = () => {
+    if (gObserver.value) gObserver.value.disconnect();
 
-    observer.value = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && !isLoading.value && openGames.value.length > 0) {
+    gObserver.value = new IntersectionObserver((entries) => {
+        if (entries[0].isIntersecting && !gLoading.value && openGames.value.length > 0) {
             getPendingGames();
         }
     }, { threshold: 0.1 });
 
-    if (observerTarget.value) {
-        observer.value.observe(observerTarget.value);
+    if (gObserverTarget.value) {
+        gObserver.value.observe(gObserverTarget.value);
     }
 }
 
 const getPendingGames = async (mode = selectedMode.value) => {
-    if (isLoading.value) return;
-    isLoading.value = true;
+    if (gLoading.value) return;
+    gLoading.value = true;
 
-
-    apiStore.gameQueryParameters.page = pageCounter.value++;
+    apiStore.gameQueryParameters.page = gPage.value++;
     apiStore.gameQueryParameters.filters.sort_direction = "asc"
     apiStore.gameQueryParameters.filters.type = mode
     apiStore.gameQueryParameters.filters.status = 'Pending'
@@ -52,7 +64,66 @@ const getPendingGames = async (mode = selectedMode.value) => {
         const newGames = response.data.data;
         openGames.value = [...openGames.value, ...newGames];
     } finally {
-        isLoading.value = false;
+        gLoading.value = false;
+    }
+}
+
+const openStats = async () => {
+    showStatsModal.value = true
+    statsLoading.value = true
+    try {
+        const response = await apiStore.getCurrentUserStats()
+        userStats.value = response.data
+    } catch (error) {
+        console.error("Failed to fetch stats", error)
+    } finally {
+        statsLoading.value = false
+    }
+}
+
+const getAvatarUrl = (filename) => {
+    return filename
+        ? `${API_BASE_URL.replace('/api/v1', '').replace('v1/')}/storage/photos_avatars/${filename}`
+        : `${API_BASE_URL.replace('/api/v1', '').replace('v1/')}/storage/photos_avatars/anonymous.png`;
+}
+
+const fetchLeaderboard = async () => {
+    if (lbLoading.value || !lbMorePages.value) return;
+    lbLoading.value = true;
+    try {
+        const response = await apiStore.getLeaderboard({ page: lbPage.value });
+        const newEntries = response.data.data;
+
+        if (newEntries.length < 10) {
+            lbMorePages.value = false;
+        }
+
+        leaderboardEntries.value = [...leaderboardEntries.value, ...newEntries];
+        lbPage.value++;
+    } finally {
+        lbLoading.value = false;
+    }
+}
+
+const openLeaderboard = async () => {
+    leaderboardEntries.value = [];
+    lbPage.value = 1;
+    showLeaderboardModal.value = true;
+    await nextTick();
+    setupLeaderboardObserver();
+    await fetchLeaderboard();
+}
+
+const setupLeaderboardObserver = () => {
+    if (lbObserver.value) lbObserver.value.disconnect();
+    lbObserver.value = new IntersectionObserver((entries) => {
+        if (entries[0].isIntersecting && !lbLoading.value && leaderboardEntries.value.length > 0) {
+            fetchLeaderboard();
+        }
+    }, { threshold: 0.1 });
+
+    if (lbObserverTarget.value) {
+        lbObserver.value.observe(lbObserverTarget.value);
     }
 }
 
@@ -60,9 +131,9 @@ const clickMode = async (mode) => {
     if (selectedMode.value === mode) return;
     openGames.value = [];
     selectedMode.value = mode;
-    pageCounter.value = 1;
+    gPage.value = 1;
     await getPendingGames();
-    setupObserver();
+    setupGamesObserver();
 }
 
 const startSingle = () => {
@@ -86,7 +157,7 @@ const toggleReady = () => {
 onMounted(async () => {
     await getPendingGames();
     await nextTick();
-    setupObserver();
+    setupGamesObserver();
 })
 </script>
 
@@ -171,8 +242,8 @@ onMounted(async () => {
                                     </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
+                                <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>
                             </div>
@@ -238,5 +309,117 @@ onMounted(async () => {
                 </CardContent>
             </Card>
         </div>
+
+        <div v-if="showStatsModal"
+            class="fixed inset-0 z-[60] flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
+            <Card class="w-full max-w-sm max-h-2/3 border-purple-500 shadow-2xl">
+                <CardHeader class="border-b bg-muted/20">
+                    <div class="flex justify-between items-center">
+                        <CardTitle class="flex items-center gap-2">
+                            <User class="text-yellow-500" /> My Statistics
+                        </CardTitle>
+                        <Button variant="ghost" size="sm" @click="showStatsModal = false">X</Button>
+                    </div>
+                </CardHeader>
+
+                <CardContent class="py-6">
+                    <div v-if="statsLoading" class="flex flex-col items-center py-10 gap-4">
+                        <div class="h-8 w-8 animate-spin rounded-full border-4 border-purple-500 border-t-transparent">
+                        </div>
+                        <p class="text-sm text-muted-foreground">Calculating your glory...</p>
+                    </div>
+
+                    <div v-else-if="userStats" class="space-y-6">
+                        <div class="text-center">
+                            <h3 class="text-2xl font-bold text-purple-600">{{ userStats.nickname }}</h3>
+                            <p class="text-sm text-muted-foreground">Performance Overview</p>
+                        </div>
+
+                        <div class="grid grid-cols-2 gap-4">
+                            <div
+                                class="rounded-lg bg-muted/50 p-4 text-center border border-transparent hover:border-purple-500/30 transition-all">
+                                <p class="text-xs uppercase text-muted-foreground font-semibold">Total Games</p>
+                                <p class="text-2xl font-bold">{{ userStats.total_games }}</p>
+                            </div>
+                            <div class="rounded-lg bg-purple-500/10 p-4 text-center border border-purple-500/20">
+                                <p class="text-xs uppercase text-purple-600 font-semibold">Win Rate</p>
+                                <p class="text-2xl font-bold text-purple-600">{{ userStats.win_rate }}</p>
+                            </div>
+                            <div class="rounded-lg bg-green-500/10 p-4 text-center border border-green-500/20">
+                                <p class="text-xs uppercase text-green-600 font-semibold">Wins</p>
+                                <p class="text-2xl font-bold text-green-600">{{ userStats.total_wins }}</p>
+                            </div>
+                            <div class="rounded-lg bg-red-500/10 p-4 text-center border border-red-500/20">
+                                <p class="text-xs uppercase text-red-600 font-semibold">Losses</p>
+                                <p class="text-2xl font-bold text-red-600">{{ userStats.total_losses }}</p>
+                            </div>
+                        </div>
+
+                        <div class="space-y-2">
+                            <div class="flex justify-between text-xs font-medium">
+                                <span>Win/Loss Ratio</span>
+                                <span>{{ userStats.total_wins }}W - {{ userStats.total_losses }}L</span>
+                            </div>
+                            <div class="h-2 w-full bg-red-500/20 rounded-full overflow-hidden flex">
+                                <div class="bg-green-500 h-full" :style="{ width: userStats.win_rate }"></div>
+                            </div>
+                        </div>
+                    </div>
+                </CardContent>
+            </Card>
+        </div>
+
+        <div v-if="showLeaderboardModal"
+            class="fixed inset-0 z-[60] flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
+            <Card class="w-full max-w-lg max-h-1/2 h-[80vh] flex flex-col border-purple-500 shadow-2xl">
+                <CardHeader class="border-b">
+                    <div class="flex justify-between items-center">
+                        <CardTitle class="flex items-center gap-2">
+                            <Trophy class="text-purple-500" /> Leaderboard
+                        </CardTitle>
+                        <Button variant="ghost" size="sm" @click="showLeaderboardModal = false">X</Button>
+                    </div>
+                </CardHeader>
+
+                <CardContent class="flex-1 overflow-y-auto custom-scrollbar p-0">
+                    <div v-for="(user, index) in leaderboardEntries" :key="user.id"
+                        class="flex items-center justify-between p-4 border-b last:border-0 hover:bg-muted/30 transition-colors">
+
+                        <div class="flex items-center gap-4">
+                            <span class="font-bold text-muted-foreground w-6 text-center"
+                                :class="{ 'text-yellow-500': index === 0, 'text-slate-400': index === 1, 'text-orange-400': index === 2 }">
+                                #{{ index + 1 }}
+                            </span>
+                            <img :src="getAvatarUrl(user.photo_avatar_filename)"
+                                class="h-10 w-10 rounded-full border border-purple-200 object-cover" alt="Avatar" />
+                            <div>
+                                <p class="font-semibold text-sm">{{ user.nickname }}</p>
+                                <p class="text-[10px] text-muted-foreground uppercase tracking-wider">Player</p>
+                            </div>
+                        </div>
+
+                        <div class="text-right">
+                            <p class="text-lg font-bold text-purple-600">{{ user.won_games_count }}</p>
+                            <p class="text-[10px] text-muted-foreground uppercase">Wins</p>
+                        </div>
+                    </div>
+
+                    <div ref="lbObserverTarget" class="h-20 flex items-center justify-center">
+                        <span v-if="lbLoading" class="text-purple-500 animate-bounce">Loading rankings...</span>
+                    </div>
+                </CardContent>
+            </Card>
+        </div>
+    </div>
+
+    <div class="fixed right-4 top-1/2 -translate-y-1/2 flex flex-col gap-4 z-40">
+        <Button @click="openLeaderboard" variant="outline" size="icon"
+            class="h-12 w-12 rounded-full shadow-lg border-purple-500 bg-card hover:bg-purple-500 hover:text-white transition-all">
+            <Trophy class="h-6 w-6" />
+        </Button>
+        <Button v-if="useAuthStore().isLoggedIn" @click="openStats" variant="outline" size="icon"
+            class="h-12 w-12 rounded-full shadow-lg border-purple-500 bg-card hover:bg-purple-500 hover:text-white transition-all">
+            <User class="h-6 w-6" />
+        </Button>
     </div>
 </template>

frontend/src/pages/purchase/CoinPurchasePage.vue

@@ -0,0 +1,139 @@
+<template>
+    <div class="flex min-h-screen items-center justify-center px-4 py-12 sm:px-6 lg:px-8">
+        <div class="w-full max-w-md space-y-8">
+            <div>
+                <h2 class="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">Buy Coins</h2>
+                <p class="mt-2 text-center text-sm text-gray-600">€1.00 = 10 Coins</p>
+            </div>
+
+            <form class="mt-8 space-y-4" @submit.prevent="handleSubmit">
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Amount (Euros)</label>
+                    <Input v-model.number="formData.euros" type="number" min="1" max="100" placeholder="Ex: 10"
+                        required />
+                    <p class="mt-1 text-xs text-blue-600 font-medium">
+                        You will receive: {{ formData.euros * 10 }} coins
+                    </p>
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Payment Method</label>
+                    <select v-model="formData.payment_type"
+                        class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2">
+                        <option value="MBWAY">MB WAY</option>
+                        <option value="MB">Multibanco (MB)</option>
+                        <option value="VISA">VISA</option>
+                        <option value="PAYPAL">PayPal</option>
+                    </select>
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">
+                        {{ referenceLabel }}
+                    </label>
+                    <Input v-model="formData.payment_reference" type="text" :placeholder="referencePlaceholder"
+                        required />
+                    <p v-if="errors.payment_reference" class="mt-1 text-xs text-red-500">
+                        {{ errors.payment_reference }}
+                    </p>
+                </div>
+
+                <div class="pt-4">
+                    <Button type="submit" class="w-full">
+                        Confirm Purchase (€{{ formData.euros }})
+                    </Button>
+                </div>
+            </form>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { Input } from '@/components/ui/input'
+import { Button } from '@/components/ui/button'
+import { usePurchaseStore } from '@/stores/purchase'
+import { useRouter } from 'vue-router'
+import { toast } from 'vue-sonner'
+import { useUserStore } from '@/stores/user'
+
+const purchaseStore = usePurchaseStore()
+const router = useRouter()
+
+const formData = ref({
+    euros: 1,
+    payment_type: 'MBWAY',
+    payment_reference: ''
+})
+
+const errors = ref({})
+
+const referenceLabel = computed(() => {
+    const labels = {
+        MBWAY: 'Phone Number',
+        MB: 'Entity-Reference',
+        VISA: 'Card Number',
+        PAYPAL: 'PayPal Email'
+    }
+    return labels[formData.value.payment_type]
+})
+
+const referencePlaceholder = computed(() => {
+    const placeholders = {
+        MBWAY: '912345678',
+        MB: '12345-123456789',
+        VISA: '1234 5678 9012 3456',
+        PAYPAL: '[email protected]'
+    }
+    return placeholders[formData.value.payment_type]
+})
+
+const validateForm = () => {
+    errors.value = {}
+    const type = formData.value.payment_type
+    const refValue = formData.value.payment_reference
+
+    const patterns = {
+        MBWAY: /^9[0-9]{8}$/,
+        MB: /^[0-9]{5}-[0-9]{9}$/,
+        VISA: /^4[0-9]{15}$/,
+        PAYPAL: /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+    }
+
+    if (!patterns[type].test(refValue)) {
+        errors.value.payment_reference = `Invalid format for ${type}`
+        return false
+    }
+
+    if (formData.value.euros < 1 || formData.value.euros > 100) {
+        toast.error("Amount must be between 1 and 100")
+        return false
+    }
+
+    return true
+}
+
+const userStore = useUserStore()
+
+const handleSubmit = async () => {
+    if (!validateForm()) return
+
+    const promise = purchaseStore.purchase(formData.value)
+
+    toast.promise(promise, {
+        loading: 'Processing transaction...',
+        success: (res) => {
+            userStore.fetchCoins()
+            router.push('/')
+            return `Purchase successful! New balance: ${res.data.balance} coins`
+        },
+        error: (error) => {
+            if (error.response?.status === 422) {
+                errors.value = error.response.data.errors
+                return "Please check the highlighted fields"
+            }
+            return error.response?.data?.message || "Transaction failed"
+        }
+    })
+}
+</script>

frontend/src/pages/user/UserPage.vue

@@ -229,11 +229,6 @@
 
         <!-- Transaction History Tab -->
         <div v-if="activeTab === 'transaction-history'" class="p-8">
-          <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">
-              No transactions yet.
-            </div>
-            <div v-else class="max-h-[450px] overflow-y-auto custom-scrollbar p-1">
 
           <div class="flex flex-wrap gap-4 mb-6 items-end">
             <div class="flex flex-col gap-1">
@@ -248,7 +243,7 @@
 
             <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="handleStartDateChange"
+              <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>
 
@@ -263,11 +258,15 @@
             </button>
           </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">
+              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"
                 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"
@@ -277,12 +276,12 @@
                   </div>
 
                   <div class="flex flex-col">
-                    <div class="font-semibold text-sm capitalize">
-                      {{ transaction.type }} Payment
-                    </div>
+                    <div class="font-semibold text-sm">
+                      {{ transaction.category }} </div>
                     <div class="text-xs text-muted-foreground">
-                      {{ new Date(transaction.created_at).toLocaleDateString() }} • {{ new
-                        Date(transaction.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) }}
+                      {{ new Date(transaction.began_at).toLocaleDateString() }} •
+                      {{ new Date(transaction.began_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
+                      }}
                     </div>
                   </div>
                 </div>
@@ -290,11 +289,10 @@
                 <div class="text-right">
                   <div class="font-bold text-sm"
                     :class="transaction.type === 'credit' ? 'text-green-600' : 'text-red-600'">
-                    {{ transaction.type === 'credit' ? '+' : '-' }}${{ transaction.amount.toLocaleString() }}
+                    {{ transaction.type === 'credit' ? '+' : '-' }}{{ transaction.amount }} coins
                   </div>
                   <div class="text-[10px] text-muted-foreground uppercase tracking-wider">
-                    {{ transaction.id.split('_')[0] }}
-                  </div>
+                    {{ transaction.reference }} </div>
                 </div>
               </div>
 
@@ -308,12 +306,6 @@
 
         <!-- Game History Tab -->
         <div v-if="activeTab === 'game-history'" class="p-8">
-          <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 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>
@@ -337,6 +329,18 @@
               </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>
@@ -363,7 +367,11 @@
             </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 class="flex items-center justify-between">
@@ -383,13 +391,13 @@
                   <div class="text-right">
                     <div class="font-bold text-sm">{{ game.amount }} pts</div>
                     <div class="text-[10px] text-muted-foreground">
-                      {{ new Date(game.created_at).toLocaleTimeString() }}
+                      {{ 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">
-                  <span>Marks: {{ game.details.marks }}</span>
                   <span>Capotes: {{ game.details.capotes }}</span>
                   <span>Bandeiras: {{ game.details.bandeiras }}</span>
                 </div>
@@ -579,7 +587,6 @@ const error = ref(null)
 const activeTab = ref('info')
 const fileInput = ref(null)
 
-// Profile form
 const profileForm = reactive({
   name: '',
   nickname: ''
@@ -588,7 +595,6 @@ const updatingProfile = ref(false)
 const profileMessage = ref('')
 const profileMessageType = ref('')
 
-// Password form
 const passwordForm = reactive({
   current_password: '',
   new_password: '',
@@ -598,7 +604,6 @@ const updatingPassword = ref(false)
 const passwordMessage = ref('')
 const passwordMessageType = ref('')
 
-// Delete account
 const deleteConfirmEmail = ref('')
 const showDeleteConfirmation = ref(false)
 const deletingAccount = ref(false)
@@ -622,13 +627,12 @@ const filters = ref({
   startDate: '',
   endDate: '',
   sort: {
-    column: 'created_at',
+    column: 'began_at',
     order: 'desc'
   }
 });
 
 const handleSortChange = (column) => {
-  // If clicking same column, toggle order, else default to desc
   if (filters.value.sort.column === column) {
     filters.value.sort.order = filters.value.sort.order === 'asc' ? 'desc' : 'asc';
   } else {
@@ -660,18 +664,26 @@ const fetchData = async () => {
 
   try {
     let newData = [];
-    if (isTransaction) {
-      // const response = await apiStore.getTransactions(params);
-      // Logic: if response.data.length < limit, set hasMore.value = false
 
-      for (let i = 0; i < 15; i++) {
-        newData.push({
-          id: `txn_${Date.now()}_${i}`,
-          amount: Math.floor(Math.random() * 1000),
-          type: Math.random() > 0.5 ? 'credit' : 'debit',
-          created_at: new Date().toISOString()
-        });
-      }
+    if (isTransaction) {
+      const apiParams = {
+        page: state.page,
+        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;
+
+      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'
+      }));
 
       transactions.value.push(...newData);
     }
@@ -680,25 +692,24 @@ const fetchData = async () => {
       const apiParams = {
         page: state.page,
         type: filters.value.variant !== 'all' ? filters.value.variant : undefined,
-        status: filters.value.outcome !== 'all' ? 'Ended' : 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
+        sort_direction: filters.value.sort.order,
       };
 
       const response = await apiStore.getCurrentUserMatches(apiParams);
-      const apiGames = response.data.data
+      const apiGames = response.data.data;
 
       newData = apiGames.map(game => {
-        const isPlayer1 = game.player1_user_id === authStore.currentUserID;
+        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.currentUserID) outcome = 'win';
-
-        const minutes = Math.floor(game.total_time / 60);
-        const seconds = game.total_time % 60;
-        const durationStr = `${minutes}m ${seconds}s`;
+        else if (game.winner_user_id === authStore.currentUser.id) outcome = 'win';
 
         return {
           id: game.id,
@@ -706,16 +717,14 @@ const fetchData = async () => {
           outcome: outcome,
           opponent: opponent?.nickname || 'Unknown Player',
           amount: isPlayer1 ? game.player1_points : game.player2_points,
-          duration: durationStr,
-          created_at: game.began_at,
+          duration: `${Math.floor(game.total_time / 60)}m ${game.total_time % 60}s`,
+          began_at: game.began_at,
           details: {
-            marks: game.custom?.marks || 0,
-            capotes: game.custom?.capotes || 0,
-            bandeiras: game.custom?.bandeiras || 0
+            capotes: 0,
+            bandeiras: 0
           }
         };
       });
-
       games.value.push(...newData);
     }
 
@@ -733,16 +742,23 @@ const setupObserver = () => {
 
   const scrollContainer = document.querySelector('.custom-scrollbar');
 
-  observer.value = new IntersectionObserver((entries) => {
-    if (entries[0].isIntersecting && !isLoading.value) {
+  observer.value = new IntersectionObserver(async (entries) => {
+    const isGame = activeTab.value === 'game-history';
+    const hasMore = isGame ? pagination.value.games.hasMore : pagination.value.transactions.hasMore;
+
+    if (entries[0].isIntersecting && !isLoading.value && hasMore) {
       fetchData();
     }
-  }, { root: scrollContainer, threshold: 0.1 });
+  }, {
+    root: scrollContainer,
+    threshold: 0.1,
+    rootMargin: '100px'
+  });
 
   if (observerTarget.value) observer.value.observe(observerTarget.value);
 };
 
-const resetAndFetch = () => {
+const resetAndFetch = async () => {
   if (activeTab.value === 'transaction-history') {
     transactions.value = [];
     pagination.value.transactions = { page: 1, hasMore: true };
@@ -753,7 +769,44 @@ const resetAndFetch = () => {
     pagination.value.games = { page: 1, hasMore: true };
   }
 
-  fetchData();
+  await nextTick();
+  await fetchData();
+  setupObserver();
+};
+
+const clearFilters = () => {
+  const isGameTab = activeTab.value === 'game-history';
+  const defaultSortColumn = isGameTab ? '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')
+    );
+
+  if (isAlreadyDefault) {
+    return;
+  }
+
+  if (isGameTab) {
+    filters.value.variant = 'all';
+    filters.value.outcome = 'all';
+  } else {
+    filters.value.type = 'all';
+  }
+
+  filters.value.startDate = '';
+  filters.value.endDate = '';
+  filters.value.sort = {
+    column: defaultSortColumn,
+    order: 'desc'
+  };
+
+  resetAndFetch();
 };
 
 const formatDate = (dateString) => {
@@ -895,13 +948,10 @@ const deleteAccount = async () => {
   try {
     await axios.delete(`${API_BASE_URL}/users/me`)
 
-    // Logout user
     await authStore.logout()
 
-    // Close modal
     showDeleteConfirmation.value = false
 
-    // Redirect to home/login
     router.push('/login')
   } catch (err) {
     deletingAccount.value = false

frontend/src/router/index.js

@@ -10,6 +10,7 @@ import TestAllAnimations from '@/pages/TestAllAnimations.vue'
 import TestGameBoard from '@/pages/TestGameBoard.vue'
 import SinglePlayerGamePage from '@/pages/game/SinglePlayerGamePage.vue'
 import RegisterPage from '@/pages/register/RegisterPage.vue'
+import CoinsPurchasePage from '@/pages/purchase/CoinPurchasePage.vue'
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -46,6 +47,12 @@ const router = createRouter({
     {
       path: '/user',
       component: UserPage,
+      meta: { requiresAuth: true },
+    },
+    {
+      path: '/coins-purchase',
+      component: CoinsPurchasePage,
+      meta: { requiresAuth: true },
     },
     {
       path: '/testing',

frontend/src/stores/api.js

@@ -80,22 +80,49 @@ export const useAPIStore = defineStore('api', () => {
     const queryParams = new URLSearchParams({
       page: params.page || 1,
       ...(params.type && { type: params.type }),
+      ...(params.outcome && { outcome: params.outcome }),
       ...(params.status && { status: params.status }),
-      sort_by: params.sort || 'began_at',
-      sort_direction: params.direction || 'desc',
+      ...(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()
 
-    console.log(params, queryParams)
-
     return axios.get(`${API_BASE_URL}/users/${authStore.currentUserID}/matches?${queryParams}`)
   }
 
+  const getCurrentUserTransactions = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+      ...(params.type && { type: params.type }),
+      ...(params.date_from && { date_from: params.date_from }),
+      ...(params.date_to && { date_to: params.date_to }),
+    }).toString()
+
+    return axios.get(`${API_BASE_URL}/users/${authStore.currentUserID}/transactions?${queryParams}`)
+  }
+
+  const getLeaderboard = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+    }).toString()
+
+    return axios.get(`${API_BASE_URL}/leaderboard?${queryParams}`)
+  }
+
+  const getCurrentUserStats = () => {
+    return axios.get(`${API_BASE_URL}/statistics/me`)
+  }
+
   return {
     postLogin,
     postLogout,
     getAuthUser,
     getGames,
     getCurrentUserMatches,
+    getCurrentUserTransactions,
+    getCurrentUserStats,
+    getLeaderboard,
     gameQueryParameters,
   }
 })

frontend/src/stores/purchase.js

@@ -0,0 +1,16 @@
+import axios from 'axios'
+import { defineStore } from 'pinia'
+import { inject } from 'vue'
+
+export const usePurchaseStore = defineStore('purchase', () => {
+
+    const API_BASE_URL = inject('apiBaseURL')
+
+    const purchase = async (data) => {
+        return await axios.post(`${API_BASE_URL}/coin-purchases`, data)
+    }
+
+    return {
+        purchase,
+    }
+})

frontend/src/stores/user.js

@@ -1,16 +1,24 @@
 import { defineStore } from 'pinia'
 import axios from 'axios'
-import { inject } from 'vue'
+import { inject, ref } from 'vue'
 
 export const useUserStore = defineStore('user', () => {
-
   const API_BASE_URL = inject('apiBaseURL')
+  const coins = ref(0)
 
-  const getCoins = async () => {
-    return await axios.get(`${API_BASE_URL}/users/me/coins`)
+  const fetchCoins = async () => {
+    try {
+      const response = await axios.get(`${API_BASE_URL}/users/me/coins`)
+      coins.value = response.data?.coins || 0
+      return response
+    } catch (error) {
+      console.error('Error fetching coins', error)
+      throw error
+    }
   }
 
   return {
-    getCoins,
+    coins,
+    fetchCoins,
   }
 })

websockets/classes/BiscaGame.js

@@ -6,6 +6,9 @@ class BiscaGame {
     this.deck = [];
     this.trumpCard = null;
     this.trumpSuit = null;
+    this.timer = null;
+    this.turnDeadline = null;
+    this.timeoutCallback = null;
 
     this.table = {
       playerCard: null,
@@ -14,7 +17,7 @@ class BiscaGame {
     };
 
     this.currentTurn = null;
-    this.status = "pending";
+    this.status = 'pending';
     this.startTime = null;
 
     this.players = {
@@ -47,11 +50,51 @@ class BiscaGame {
     this.currentTurn = playerIds.find((id) => id != 1) || playerIds[0];
 
     this.startTime = Date.now();
-    this.status = "playing";
+    this.status = 'playing';
+  }
+
+  startTurnTimer(callback) {
+    if (this.timer) clearTimeout(this.timer);
+
+    this.timeoutCallback = callback;
+    const DURATION_MS = 20000;
+    this.turnDeadline = Date.now() + DURATION_MS;
+
+    console.log(`[Game ${this.id}] Timer started for User ${this.currentTurn}`);
+
+    this.timer = setTimeout(() => {
+      this.handleTimeout();
+    }, DURATION_MS);
+  }
+
+  stopTimer() {
+    if (this.timer) clearTimeout(this.timer);
+    this.timer = null;
+    this.turnDeadline = null;
+  }
+
+  handleTimeout() {
+    console.log(
+      `[Game ${this.id}] Timeout! Auto-playing for ${this.currentTurn}`,
+    );
+
+    const lowestCard = this.getLowestCard(this.currentTurn);
+
+    if (lowestCard && this.timeoutCallback) {
+      this.timeoutCallback(this.currentTurn, lowestCard.id);
+    }
+  }
+
+  getLowestCard(userId) {
+    const hand = this.players[userId].hand;
+    if (!hand || hand.length === 0) return null;
+
+    const sortedHand = [...hand].sort((a, b) => a.strength - b.strength);
+    return sortedHand[0];
   }
 
   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 = [];
 
@@ -87,7 +130,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);
@@ -101,17 +144,19 @@ 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!' };
       }
     }
 
+    this.stopTimer();
+
     player.hand.splice(cardIndex, 1);
 
     if (!this.table.playerCard) {
       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();
@@ -151,7 +196,8 @@ 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);
       const p1Obj = this.players[pIds[0]];
@@ -174,7 +220,7 @@ class BiscaGame {
           : p1Obj.id;
 
       return {
-        action: "game_ended",
+        action: 'game_ended',
         trickResult,
         winnerId: finalWinner,
         loserId: finalLoser,
@@ -187,7 +233,7 @@ class BiscaGame {
       };
     }
 
-    return { action: "trick_resolved", trickResult };
+    return { action: 'trick_resolved', trickResult };
   }
 
   getStateForPlayer(userId) {
@@ -205,6 +251,7 @@ class BiscaGame {
         points: this.players[oppId].points,
         cardCount: this.players[oppId].hand.length,
       },
+      turnDeadline: this.turnDeadline,
     };
   }
 
@@ -232,4 +279,4 @@ class BiscaGame {
   }
 }
 
-module.exports = BiscaGame;
+export default BiscaGame;

websockets/events/connection.js

@@ -1,4 +1,4 @@
-import { addUser, removeUser } from "../state/connection";
+import { addUser, removeUser } from '../state/connection.js';
 
 const HEARTBEAT_INTERVAL = 30000; // 30 seconds
 const HEARTBEAT_TIMEOUT = 10000; // 10 seconds
@@ -8,39 +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`);
-    console.log(`[Connection] ${getUserCount()} users online`);
   });
 
-  socket.on("leave", () => {
+  socket.on('leave', () => {
     const user = removeUser(socket.id);
     if (user) {
       console.log(`[Connection] User ${user.name} has left the server`);
-      console.log(`[Connection] ${getUserCount()} users online`);
     }
   });
 
-  socket.on("disconnect", () => {
-    console.log("Connection Lost:", socket.id);
+  socket.on('disconnect', () => {
+    console.log('Connection Lost:', socket.id);
     removeUser(socket.id);
-    console.log(`[Connection] ${getUserCount()} users online`);
   });
 };

websockets/events/game.js

@@ -28,6 +28,78 @@ async function saveGameResult(gameId, result, token) {
   }
 }
 
+const handleGameMove = (io, gameId, userId, cardId) => {
+  const game = getGame(gameId);
+  if (!game) return;
+
+  const result = game.playCard(userId, cardId);
+
+  if (result.error) {
+    console.log(`[Game Error] ${result.error}`);
+    return;
+  }
+
+  const roomName = `game_${gameId}`;
+  const socketsInRoom = io.sockets.adapter.rooms.get(roomName);
+
+  if (socketsInRoom) {
+    for (const socketId of socketsInRoom) {
+      const s = io.sockets.sockets.get(socketId);
+      const u = getUser(socketId);
+      if (u && game.players[u.id]) {
+        s.emit("game-state", game.getStateForPlayer(u.id));
+      }
+    }
+  }
+
+  if (result.action === "trick_resolved") {
+    io.to(roomName).emit("trick-end", result.trickResult);
+  }
+
+  if (result.action === "game_ended") {
+    io.to(roomName).emit("game-over", {
+      winnerId: result.winnerId,
+      isDraw: result.isDraw,
+      p1Points: result.player1_points,
+      p2Points: result.player2_points,
+    });
+
+    let tokenToUse = null;
+    const playerIds = Object.keys(game.players);
+
+    for (const pid of playerIds) {
+      if (game.players[pid] && game.players[pid].token) {
+        tokenToUse = game.players[pid].token;
+        break;
+      }
+    }
+
+    if (tokenToUse) {
+      saveGameResult(gameId, result, tokenToUse);
+      console.log(`[DB] Jogo salvo usando o token de um dos jogadores.`);
+    } else {
+      console.error(
+        `[DB Error] CRÍTICO: Nenhum jogador tem token. O jogo ${gameId} não foi salvo.`
+      );
+    }
+  }
+
+  if (result.action === "next_turn" || result.action === "trick_resolved") {
+    game.startTurnTimer((timeoutUserId, timeoutCardId) => {
+      handleGameMove(io, gameId, timeoutUserId, timeoutCardId);
+    });
+
+    if (socketsInRoom) {
+      for (const socketId of socketsInRoom) {
+        const s = io.sockets.sockets.get(socketId);
+        const u = getUser(socketId);
+        if (u && game.players[u.id])
+          s.emit("game-state", game.getStateForPlayer(u.id));
+      }
+    }
+  }
+};
+
 export default (io, socket) => {
   socket.on("join-game", async ({ gameId }) => {
     const user = getUser(socket.id);
@@ -47,6 +119,39 @@ export default (io, socket) => {
 
         const gameData = response.data.data || response.data;
 
+        console.log(
+          `[Join Debug] API Data recebida para Jogo ${gameId}:`,
+          gameData ? "OK" : "NULL"
+        );
+
+        if (
+          gameData.player2_user_id == 1 &&
+          user.id != gameData.player1_user_id
+        ) {
+          try {
+            console.log(
+              `[API Sync] A oficializar User ${user.id} como Player 2 na BD...`
+            );
+            await axios.post(
+              `${API_URL}/games/${gameId}/join`,
+              {},
+              {
+                headers: { Authorization: token },
+              }
+            );
+            console.log(`[API Sync] Sucesso! O jogo passou a 'Playing' na BD.`);
+
+            gameData.player2_user_id = user.id;
+            gameData.player2 = { name: user.name };
+            gameData.status = "Playing";
+          } catch (joinError) {
+            console.error(
+              `[API Sync Error] Falha ao fazer join na BD:`,
+              joinError.message
+            );
+          }
+        }
+
         if (gameData.status === "Ended") {
           socket.emit("error", { message: "Game already finished." });
           return;
@@ -71,7 +176,18 @@ export default (io, socket) => {
           { id: gameData.player1_user_id, name: p1Name },
           { id: gameData.player2_user_id, name: p2Name }
         );
+        console.log(
+          `[Join Debug] Jogo criado?`,
+          game ? "SIM" : "NÃO (Undefined)"
+        );
       } catch (error) {
+        if (error.response) {
+          console.error(`[Join Error] Status: ${error.response.status}`);
+          console.error(`[Join Error] Data:`, error.response.data);
+        } else {
+          console.error(`[Join Error] Message:`, error.message);
+        }
+
         socket.emit("error", { message: "Failed to join game." });
         return;
       }
@@ -80,8 +196,13 @@ export default (io, socket) => {
     const GHOST_ID = 1;
 
     if (game && game.players) {
-      if (!game.players[user.id]) {
-        if (game.players[GHOST_ID]) {
+      if (game.players[user.id]) {
+        game.players[user.id].token = socket.handshake.auth.token;
+      }
+
+      if (!game.players[user.id] && game.players[GHOST_ID]) {
+        console.log(`[Ghost Swap] User ${user.name} substituiu o Fantasma.`);
+
         delete game.players[GHOST_ID];
         game.players[user.id] = {
           id: user.id,
@@ -89,8 +210,23 @@ export default (io, socket) => {
           hand: [],
           points: 0,
           tricks: 0,
+          token: socket.handshake.auth.token,
         };
+
+        const token = socket.handshake.auth.token;
+
+        axios
+          .post(
+            `${API_URL}/games/${gameId}/join`,
+            {},
+            {
+              headers: { Authorization: token },
             }
+          )
+          .then(() =>
+            console.log(`[API Sync] Sucesso! BD atualizada para 'Playing'.`)
+          )
+          .catch((err) => console.error(`[API Sync Error]`, err.message));
       }
     }
 
@@ -99,6 +235,11 @@ export default (io, socket) => {
     if (game && game.players[user.id]) {
       socket.emit("game-state", game.getStateForPlayer(user.id));
       console.log(`--> Estado enviado para User ${user.id}`);
+      game.players[user.id].token = socket.handshake.auth.token;
+      if (!game.timer && game.status === "playing") {
+        game.startTurnTimer((uId, cId) => handleGameMove(io, gameId, uId, cId));
+      }
+      socket.emit("game-state", game.getStateForPlayer(user.id));
     } else {
       socket.emit("error", { message: "Error joining game state." });
     }
@@ -117,6 +258,8 @@ export default (io, socket) => {
       return;
     }
 
+    handleGameMove(io, gameId, user.id, cardId);
+
     const roomName = `game_${gameId}`;
     const socketsInRoom = io.sockets.adapter.rooms.get(roomName);
     if (socketsInRoom) {

websockets/package.json

@@ -2,6 +2,7 @@
   "name": "websockets",
   "version": "1.0.0",
   "main": "index.js",
+  "type": "module",
   "scripts": {
     "dev": "nodemon index.js",
     "start": "bun index.js "

websockets/server.js

@@ -18,15 +18,22 @@ export const serverStart = (port) => {
   });
 
   server.io.use(async (socket, next) => {
-    const token = socket.handshake.auth.token;
+    let token = socket.handshake.auth.token;
 
     if (!token) {
       return next(new Error("Authentication error: No token provided"));
     }
 
+    if (!token.startsWith("Bearer ")) {
+      token = "Bearer " + token;
+    }
+
     try {
       const response = await axios.get(`${API_URL}/users/me`, {
-        headers: { Authorization: token },
+        headers: { 
+            Authorization: token,
+            Accept: "application/json" 
+        },
       });
 
       const user = response.data.data || response.data;
@@ -35,6 +42,9 @@ export const serverStart = (port) => {
         return next(new Error("Authentication error: User data not found"));
       }
 
+      socket.user = user;
+      socket.handshake.auth.token = token; 
+
       addUser(socket.id, user); 
 
       next();
@@ -53,15 +63,12 @@ export const serverStart = (port) => {
   });
 
   server.io.on("connection", (socket) => {
-    console.log("New connection:", socket.id);
-
     gameEvents(server.io, socket);
 
     handleConnectionEvents(server.io, socket);
 
     socket.on("disconnect", () => {
       removeUser(socket.id);
-      console.log("Disconnected:", socket.id);
     });
   });
 };

websockets/state/game.js

@@ -1,4 +1,4 @@
-const BiscaGame = require("../classes/BiscaGame");
+import BiscaGame from '../classes/BiscaGame.js';
 
 const activeGames = new Map();
 
@@ -18,12 +18,12 @@ const getGame = (id) => {
 };
 
 const removeGame = (id) => {
+  const game = activeGames.get(id);
+  if (game) {
+    game.stopTimer();
     activeGames.delete(id);
     console.log(`[Game State] Game removed: ${id}`);
+  }
 };
 
-module.exports = {
-  createGame,
-  getGame,
-  removeGame,
-};
+export { createGame, getGame, removeGame };