api/app/Http/Controllers/AuthController.php

@@ -58,12 +58,20 @@ class AuthController extends Controller
             return response()->json(['message' => 'Nickname already registered'], 409);
         }
 
+        $avatarFilename = null;
+
+        if ($request->hasFile('photo_avatar_filename')) {
+            $file = $request->file('photo_avatar_filename');
+            $path = $file->store('photos_avatars', 'public');
+            $avatarFilename = basename($path);
+        }
+
         $user = User::create([
             'email' => $request->email,
             'nickname' => $request->nickname,
             'name' => $request->name,
             'password' => bcrypt($request->password),
-            'photo_avatar_filename' => $request->photo,
+            'photo_avatar_filename' => $avatarFilename,
             'type' => 'P',
             'blocked' => false,
             'coins_balance' => 10,

api/app/Http/Requests/RegisterRequest.php

@@ -26,7 +26,7 @@ class RegisterRequest extends FormRequest
             'nickname' => 'required|string|max:255',
             'name' => 'required|string|max:255',
             'password' => 'required|string|min:3',
-            'photo' => 'nullable|string',
+            'photo' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048',
         ];
     }
 }

api/sample-requests.http

@@ -1,6 +1,6 @@
 ### Get All Students (Login)
 # @name login
-POST http://localhost:8000/api/login
+POST http://localhost:8000/api/v1/login
 Content-Type: application/json
 Accept: application/json
 
@@ -9,11 +9,24 @@ Accept: application/json
     "password": "123"
 }
 
-### Capture the token
+### Capture the token & id
 @token = {{login.response.body.token}}
+@id = {{login.response.body.user.id}}
 
 ### Get All matches
-GET http://localhost:8000/api/matches
+GET http://localhost:8000/api/v1/matches
+Content-Type: application/json
+Accept: application/json
+Authorization: Bearer {{token}}
+
+### Get me user
+GET http://localhost:8000/api/v1/users/me
+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}}

frontend/src/components/layout/NavBar.vue

@@ -22,13 +22,23 @@
                     </NavigationMenuLink>
                 </NavigationMenuItem>
 
-                <NavigationMenuItem v-else>
-                    <NavigationMenuLink>
-                        <a href="/home" @click.prevent="logoutClickHandler" class="cursor-pointer">Logout</a>
+                <NavigationMenuItem v-else class="flex flex-row gap-4">
+                    <NavigationMenuLink v-if="coins > 0" href="/user?tab=transaction-history"
+                        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>
+                        </span>
                     </NavigationMenuLink>
                     <NavigationMenuLink>
                         <RouterLink to="/user">Profile</RouterLink>
                     </NavigationMenuLink>
+                    <NavigationMenuLink>
+                        <a href="/home" @click.prevent="logoutClickHandler" class="cursor-pointer">Logout</a>
+                    </NavigationMenuLink>
                 </NavigationMenuItem>
             </NavigationMenuList>
         </NavigationMenu>
@@ -46,16 +56,20 @@ import {
     NavigationMenuTrigger,
 } from '@/components/ui/navigation-menu'
 import router from '@/router';
+import { ref, watch } from 'vue';
+import { useUserStore } from '@/stores/user';
+
 
 const emits = defineEmits(['logout'])
 const { userLoggedIn } = defineProps(['userLoggedIn'])
+const coins = ref(0);
 
 const biscaStore = useBiscaStore()
 
 const logoutClickHandler = () => {
     if (biscaStore.isGameRunning) {
         const confirmLogout = window.confirm(
-            '⚠️ Jogo em Progresso!\n\nSe fizeres Logout agora, perderás o jogo atual e serás considerado PERDEDOR.\n\nQueres mesmo sair?'
+            'If you leave now this game will count as "FORFEIT". Are you sure you want to logout?'
         )
         if (!confirmLogout) return
 
@@ -67,7 +81,25 @@ const logoutClickHandler = () => {
     }
 
     emits('logout')
-
-    router.push({ name: 'home' }) 
+    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)
+        }
+    }
+}
+
+watch(() => userLoggedIn, async (isLoggedIn) => {
+    if (isLoggedIn) {
+        await fetchUserCoins()
+    } else {
+        coins.value = 0
+    }
+}, { immediate: true })
 </script>

frontend/src/pages/login/LoginPage.vue

@@ -44,7 +44,7 @@
 
                 <div class="text-center text-sm">
                     <span class="text-gray-600">Don't have an account? </span>
-                    <a href="#" class="font-medium text-blue-600 hover:text-blue-500">
+                    <a href="/register" class="font-medium text-blue-600 hover:text-blue-500">
                         Sign up
                     </a>
                 </div>

frontend/src/pages/register/RegisterPage.vue

@@ -0,0 +1,151 @@
+<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">Sign up</h2>
+                <p class="mt-2 text-center text-sm text-gray-600">Enter your data to create your account</p>
+            </div>
+
+            <form class="mt-8 space-y-4" @submit.prevent="handleSubmit">
+                <div class="flex flex-col items-center justify-center space-y-2">
+                    <label for="avatar-upload"
+                        class="group relative flex h-24 w-24 cursor-pointer items-center justify-center overflow-hidden rounded-full border-2 border-dashed border-gray-300 bg-gray-50 transition hover:border-blue-400 hover:bg-gray-100">
+                        <img v-if="imagePreview" :src="imagePreview" class="h-full w-full object-cover" />
+
+                        <div v-else class="flex flex-col items-center text-gray-400">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8" fill="none" viewBox="0 0 24 24"
+                                stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                    d="M12 4v16m8-8H4" />
+                            </svg>
+                            <span class="text-[10px] font-medium">UPLOAD</span>
+                        </div>
+
+                        <div
+                            class="absolute inset-0 flex items-center justify-center bg-black/20 opacity-0 transition group-hover:opacity-100">
+                            <span class="text-xs font-semibold text-white">Change</span>
+                        </div>
+                    </label>
+
+                    <input id="avatar-upload" type="file" class="hidden" accept="image/*" @change="handleFileChange" />
+                    <p class="text-xs text-gray-500">Optional</p>
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Full Name</label>
+                    <Input v-model="formData.name" type="text" placeholder="John Doe" required />
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Nickname</label>
+                    <Input v-model="formData.nickname" type="text" placeholder="johny123" required />
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Email address</label>
+                    <Input v-model="formData.email" type="email" placeholder="[email protected]" />
+                    <p v-if="errors.email" class="mt-1 text-xs text-red-500">{{ errors.email }}</p>
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Password</label>
+                    <Input v-model="formData.password" type="password" placeholder="••••••••" />
+                    <p v-if="errors.password" class="mt-1 text-xs text-red-500">{{ errors.password }}</p>
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Confirm Password</label>
+                    <Input v-model="formData.confirmPassword" type="password" placeholder="••••••••" />
+                    <p v-if="errors.confirmPassword" class="mt-1 text-xs text-red-500">{{ errors.confirmPassword }}</p>
+                </div>
+
+                <div class="pt-4">
+                    <Button type="submit" class="w-full">Create Account</Button>
+                </div>
+            </form>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { Input } from '@/components/ui/input'
+import { Button } from '@/components/ui/button'
+import { useRegisterStore } from '@/stores/register'
+import { useRouter } from 'vue-router'
+import { toast } from 'vue-sonner'
+
+const registerStore = useRegisterStore()
+const router = useRouter()
+
+const formData = ref({
+    email: '',
+    nickname: '',
+    name: '',
+    password: '',
+    confirmPassword: '',
+    photo: ''
+})
+
+const imagePreview = ref(null)
+const errors = ref({})
+
+const handleFileChange = (event) => {
+    const file = event.target.files[0]
+    if (file) {
+        formData.value.photo = file
+
+        imagePreview.value = URL.createObjectURL(file)
+    }
+    console.log(formData, file)
+}
+
+const validateForm = () => {
+    errors.value = {} // Reset errors
+    let isValid = true
+
+    if (!formData.value.email.match(/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/)) {
+        errors.value.email = "Please enter a valid email"
+        isValid = false
+    }
+
+    if (!formData.value.password || formData.value.password.length < 3) {
+        errors.value.password = "Password must be at least 3 characters"
+        isValid = false
+    }
+
+    if (formData.value.password !== formData.value.confirmPassword) {
+        errors.value.confirmPassword = "Passwords do not match"
+        isValid = false
+    }
+
+    return isValid
+}
+
+const handleSubmit = async () => {
+    if (!validateForm()) {
+        toast.error("Please fix the errors in the form")
+        return
+    }
+
+    const data = new FormData()
+    data.append('email', formData.value.email)
+    data.append('nickname', formData.value.nickname)
+    data.append('name', formData.value.name)
+    data.append('password', formData.value.password)
+
+    if (formData.value.photo) {
+        data.append('photo_avatar_filename', formData.value.photo)
+    }
+
+    const promise = registerStore.register(data)
+    toast.promise(promise, {
+        loading: 'Creating your account...',
+        success: (res) => {
+            router.push('/login')
+            return `Registration Successful - ${res.data.user.name}`
+        },
+        error: (error) => error.response?.data?.message || "Registration failed"
+    })
+}
+</script>

frontend/src/pages/user/UserPage.vue

@@ -9,7 +9,8 @@
     </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">
+    <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" />
@@ -17,7 +18,8 @@
       </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" />
@@ -27,37 +29,33 @@
     </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', '')}/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">
+        <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">
           <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>
@@ -71,26 +69,32 @@
         <div class="flex border-b border-gray-300 bg-gray-50">
           <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'"
-          >
+            @click="activeTab = 'info'">
             Profile Information
           </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'"
-          >
+            @click="activeTab = 'edit'">
             Edit Profile
           </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 === 'transaction-history' }]"
+            @click="activeTab = 'transaction-history'">
+            Transaction History
+          </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 === 'game-history' }]"
+            @click="activeTab = 'game-history'">
+            Game History
+          </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'"
-          >
+            @click="activeTab = 'password'">
             Change Password
           </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 === 'delete' }]"
-            @click="activeTab = 'delete'"
-          >
+            @click="activeTab = 'delete'">
             Delete Account
           </button>
         </div>
@@ -119,7 +123,8 @@
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Account Type</label>
+                <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>
@@ -134,7 +139,8 @@
                 </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>
@@ -149,14 +155,16 @@
               <div class="flex-1">
                 <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']">
+                  <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']">
                     {{ 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">
                   <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14" />
@@ -164,7 +172,8 @@
                 </svg>
               </div>
               <div class="flex-1">
-                <label class="block text-xs font-semibold text-gray-500 mb-1 uppercase tracking-wider">Email Verified</label>
+                <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>
@@ -177,7 +186,8 @@
                 </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>
@@ -189,94 +199,250 @@
           <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"
-              />
+              <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'" 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">
+                  <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">
+                    <option value="all">All Types</option>
+                    <option value="credit">Credit (+)</option>
+                    <option value="debit">Debit (-)</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="handleStartDateChange"
+                    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>
+
+              <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'
+                ]">
+
+                <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'">
+                    <span v-if="transaction.type === 'credit'">+</span>
+                    <span v-else>-</span>
+                  </div>
+
+                  <div class="flex flex-col">
+                    <div class="font-semibold text-sm capitalize">
+                      {{ transaction.type }} Payment
+                    </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' }) }}
+                    </div>
+                  </div>
+                </div>
+
+                <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() }}
+                  </div>
+                  <div class="text-[10px] text-muted-foreground uppercase tracking-wider">
+                    {{ transaction.id.split('_')[0] }}
+                  </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>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 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>
+                  <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>
+
+                <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 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">
+                      {{ game.outcome }}
+                    </div>
+                    <div>
+                      <div class="font-semibold text-sm">vs {{ game.opponent }}</div>
+                      <div class="text-xs text-muted-foreground">
+                        {{ game.variant }} • {{ game.duration }}
+                      </div>
+                    </div>
+                  </div>
+
+                  <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() }}
+                    </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>
+              </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"
+              <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"
-              />
+                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>
@@ -287,7 +453,8 @@
           <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">
+                <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" />
@@ -299,7 +466,8 @@
                   </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>
@@ -312,29 +480,21 @@
                 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>
@@ -345,11 +505,9 @@
     </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>
@@ -357,7 +515,8 @@
 
         <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" />
@@ -367,7 +526,8 @@
                 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>
@@ -379,18 +539,12 @@
         </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>
@@ -398,7 +552,8 @@
     </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>
@@ -408,10 +563,10 @@
 </template>
 
 <script setup>
-import { ref, onMounted, inject, reactive } from 'vue'
+import { ref, onMounted, inject, reactive, watch, nextTick } from 'vue'
 import { useAuthStore } from '@/stores/auth'
 import { useAPIStore } from '@/stores/api'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import axios from 'axios'
 
 const authStore = useAuthStore()
@@ -448,6 +603,159 @@ const deleteConfirmEmail = ref('')
 const showDeleteConfirmation = ref(false)
 const deletingAccount = ref(false)
 
+const transactions = ref([]);
+const games = ref([]);
+
+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 }
+});
+
+const filters = ref({
+  type: 'all',
+  variant: 'all',
+  outcome: 'all',
+  startDate: '',
+  endDate: '',
+  sort: {
+    column: 'created_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 {
+    filters.value.sort.column = column;
+    filters.value.sort.order = 'desc';
+  }
+  resetAndFetch();
+};
+
+watch(activeTab, async (newTab) => {
+  if (newTab !== 'transaction-history' && newTab !== 'game-history') return;
+
+  await nextTick();
+
+  if (transactions.value.length !== 0 && games.value.length !== 0) return;
+
+  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;
+
+  if (isLoading.value || !state.hasMore) return;
+  isLoading.value = true;
+
+  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()
+        });
+      }
+
+      transactions.value.push(...newData);
+    }
+
+    if (isGame) {
+      const apiParams = {
+        page: state.page,
+        type: filters.value.variant !== 'all' ? filters.value.variant : undefined,
+        status: filters.value.outcome !== 'all' ? 'Ended' : undefined,
+        sort_by: filters.value.sort.column,
+        sort_direction: filters.value.sort.order
+      };
+
+      const response = await apiStore.getCurrentUserMatches(apiParams);
+      const apiGames = response.data.data
+
+      newData = apiGames.map(game => {
+        const isPlayer1 = game.player1_user_id === authStore.currentUserID;
+        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`;
+
+        return {
+          id: game.id,
+          variant: `Type ${game.type}`,
+          outcome: outcome,
+          opponent: opponent?.nickname || 'Unknown Player',
+          amount: isPlayer1 ? game.player1_points : game.player2_points,
+          duration: durationStr,
+          created_at: game.began_at,
+          details: {
+            marks: game.custom?.marks || 0,
+            capotes: game.custom?.capotes || 0,
+            bandeiras: game.custom?.bandeiras || 0
+          }
+        };
+      });
+
+      games.value.push(...newData);
+    }
+
+    if (newData.length < 10) state.hasMore = false;
+    state.page++;
+  } catch (error) {
+    console.error("Fetch failed", error);
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+const setupObserver = () => {
+  if (observer.value) observer.value.disconnect();
+
+  const scrollContainer = document.querySelector('.custom-scrollbar');
+
+  observer.value = new IntersectionObserver((entries) => {
+    if (entries[0].isIntersecting && !isLoading.value) {
+      fetchData();
+    }
+  }, { root: scrollContainer, threshold: 0.1 });
+
+  if (observerTarget.value) observer.value.observe(observerTarget.value);
+};
+
+const resetAndFetch = () => {
+  if (activeTab.value === 'transaction-history') {
+    transactions.value = [];
+    pagination.value.transactions = { page: 1, hasMore: true };
+  }
+
+  if (activeTab.value === 'game-history') {
+    games.value = [];
+    pagination.value.games = { page: 1, hasMore: true };
+  }
+
+  fetchData();
+};
+
 const formatDate = (dateString) => {
   const date = new Date(dateString)
   return date.toLocaleDateString('en-US', {
@@ -607,6 +915,11 @@ onMounted(async () => {
     router.push('/login')
     return
   }
+  const route = useRoute()
+  if (route.query.tab) {
+    activeTab.value = route.query.tab;
+    router.replace({ query: {} });
+  }
 
   if (!authStore.currentUser) {
     await fetchProfile()

frontend/src/router/index.js

@@ -2,14 +2,14 @@ import HomePage from '@/pages/home/HomePage.vue'
 import LoginPage from '@/pages/login/LoginPage.vue'
 import LaravelPage from '@/pages/testing/LaravelPage.vue'
 import WebsocketsPage from '@/pages/testing/WebsocketsPage.vue'
+import UserPage from '@/pages/user/UserPage.vue'
+import { createRouter, createWebHistory } from 'vue-router'
 import TestAnimations from '@/pages/TestAnimations.vue'
 import TestDealing from '@/pages/TestDealing.vue'
 import TestAllAnimations from '@/pages/TestAllAnimations.vue'
 import TestGameBoard from '@/pages/TestGameBoard.vue'
-import UserPage from '@/pages/user/UserPage.vue'
 import SinglePlayerGamePage from '@/pages/game/SinglePlayerGamePage.vue'
-import { createRouter, createWebHistory } from 'vue-router'
-import { toast } from 'vue-sonner'
+import RegisterPage from '@/pages/register/RegisterPage.vue'
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -25,18 +25,9 @@ const router = createRouter({
       component: LoginPage,
     },
     {
-      path: '/game/3',
-      name: 'bisca3',
-      component: SinglePlayerGamePage,
-      props: { gameType: 3 },
-      meta: { requiresAuth: true },
-    },
-    {
-      path: '/game/9',
-      name: 'bisca9',
-      component: SinglePlayerGamePage,
-      props: { gameType: 9 },
-      meta: { requiresAuth: true },
+      path: '/register',
+      name: 'register',
+      component: RegisterPage,
     },
     {
       path: '/game/3',

frontend/src/stores/api.js

@@ -53,12 +53,10 @@ export const useAPIStore = defineStore('api', () => {
     delete axios.defaults.headers.common['Authorization']
   }
 
-  // Users
   const getAuthUser = () => {
     return axios.get(`${API_BASE_URL}/users/me`)
   }
 
-  //Games
   const getGames = (resetPagination = false) => {
     if (resetPagination) {
       gameQueryParameters.value.page = 1
@@ -78,11 +76,26 @@ export const useAPIStore = defineStore('api', () => {
     return axios.get(`${API_BASE_URL}/games?${queryParams}`)
   }
 
+  const getCurrentUserMatches = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+      ...(params.type && { type: params.type }),
+      ...(params.status && { status: params.status }),
+      sort_by: params.sort || 'began_at',
+      sort_direction: params.direction || 'desc',
+    }).toString()
+
+    console.log(params, queryParams)
+
+    return axios.get(`${API_BASE_URL}/users/${authStore.currentUserID}/matches?${queryParams}`)
+  }
+
   return {
     postLogin,
     postLogout,
     getAuthUser,
     getGames,
+    getCurrentUserMatches,
     gameQueryParameters,
   }
 })

frontend/src/stores/auth.js

@@ -7,8 +7,6 @@ export const useAuthStore = defineStore('auth', () => {
   const DEFAULT_TIMEOUT = 5 * 60 * 1000
   const REMEMBER_ME_TIMEOUT = 365 * 24 * 60 * 60 * 1000
 
-
-
   const currentUser = ref(undefined)
   const token = ref(localStorage.getItem('token') || null)
   const tokenExpiry = ref(localStorage.getItem('tokenExpiry') ? parseInt(localStorage.getItem('tokenExpiry')) : null)
@@ -54,10 +52,14 @@ export const useAuthStore = defineStore('auth', () => {
   const login = async (credentials) => {
     const apiStore = useAPIStore()
     const loginResp = await apiStore.postLogin(credentials)
-    const userResp = await apiStore.getAuthUser()
+    return await setLocalStorageUser(apiStore, loginResp, true)
+  }
 
-    const jwtToken = loginResp.data.token
-    setToken(jwtToken, credentials.rememberMe)
+  const setLocalStorageUser = async (api, response, rememberMe) => {
+    const userResp = await api.getAuthUser()
+
+    const jwtToken = response.data.token
+    setToken(jwtToken, rememberMe)
     currentUser.value = userResp.data
 
     localStorage.setItem('currentUser', JSON.stringify(userResp.data))
@@ -72,15 +74,8 @@ export const useAuthStore = defineStore('auth', () => {
     localStorage.removeItem('currentUser')
   }
 
-  const checkTokenExpiry = () => {
-    if (isTokenAlmostExpired()) {
-      logout()
-      return false
-    }
-    return true
-  }
-
   const restoreSession = async () => {
+    const apiStore = useAPIStore()
     const storedToken = localStorage.getItem('token')
     const storedUser = localStorage.getItem('currentUser')
     const storedTokenExpiry = localStorage.getItem('tokenExpiry')
@@ -102,7 +97,6 @@ export const useAuthStore = defineStore('auth', () => {
       try {
         currentUser.value = JSON.parse(storedUser)
       } catch (e) {
-        // If stored user data is corrupted, fetch fresh data from API
         try {
           const userResp = await apiStore.getAuthUser()
           currentUser.value = userResp.data
@@ -124,13 +118,11 @@ export const useAuthStore = defineStore('auth', () => {
     currentUserID,
     token,
     rememberMe,
-    setToken,
     getToken,
     login,
     logout,
     resetTokenExpiry,
     isTokenAlmostExpired,
-    checkTokenExpiry,
     restoreSession,
   }
 })

frontend/src/stores/register.js

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

frontend/src/stores/user.js

@@ -1,58 +1,16 @@
 import { defineStore } from 'pinia'
 import axios from 'axios'
-import { useAuthStore } from './auth'
+import { inject } from 'vue'
 
-export const useUserStore = defineStore('user', {
-  state: () => ({
-    user: null,
-    loading: false,
-    error: null
-  }),
+export const useUserStore = defineStore('user', () => {
 
-  getters: {
-    currentUser: (state) => state.user
-  },
+  const API_BASE_URL = inject('apiBaseURL')
 
-  actions: {
-    async fetchUserProfile() {
-      const authStore = useAuthStore()
-      const token = authStore.getToken()
-
-      if (!token) {
-        this.error = 'No authentication token found'
-        throw new Error('No authentication token found')
+  const getCoins = async () => {
+    return await axios.get(`${API_BASE_URL}/users/me/coins`)
   }
 
-      this.loading = true
-      this.error = null
-
-      try {
-        const response = await axios.get('/api/users/me', {
-          headers: {
-            Authorization: `Bearer ${token}`,
-            Accept: 'application/json'
-          }
-        })
-
-        this.user = response.data
-        return response.data
-      } catch (error) {
-        this.error = error.response?.data?.message || 'Failed to fetch user profile'
-
-        if (error.response?.status === 401) {
-          authStore.logout()
-        }
-
-        throw error
-      } finally {
-        this.loading = false
-      }
-    },
-
-    clearUser() {
-      this.user = null
-      this.error = null
-      this.loading = false
-    }
+  return {
+    getCoins,
   }
 })