Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a7b1b9794 | ||
|
|
ef277a3cfd | ||
|
|
e23ca3d1ff | ||
|
|
bcdf542606 | ||
|
|
16f8d3bdfc | ||
|
|
45d8aa0035 | ||
|
|
c0af76abd3 | ||
|
|
ff16a57a97 |
@@ -15,7 +15,7 @@ class CoinPurchaseController extends Controller
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'euros' => 'required|numeric|min:1|max:100',
|
||||
'payment_type' => 'required|in:MBWAY,IBAN,MB,VISA,PAYPAL',
|
||||
'payment_type' => 'required|in:MBWAY,MB,VISA,PAYPAL',
|
||||
'payment_reference' => [
|
||||
'required',
|
||||
function ($attribute, $value, $fail) use ($request) {
|
||||
@@ -24,7 +24,6 @@ class CoinPurchaseController extends Controller
|
||||
|
||||
switch ($type) {
|
||||
case 'MBWAY': $regex = '/^9[0-9]{8}$/'; break;
|
||||
case 'IBAN': $regex = '/^[A-Z]{2}[0-9]{23}$/'; break;
|
||||
case 'MB': $regex = '/^[0-9]{5}-[0-9]{9}$/'; break;
|
||||
case 'VISA': $regex = '/^4[0-9]{15}$/'; break;
|
||||
case 'PAYPAL':
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -25,6 +25,12 @@ 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
|
||||
@@ -36,3 +42,26 @@ 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}}
|
||||
@@ -0,0 +1,15 @@
|
||||
meta {
|
||||
name: Create Game
|
||||
type: http
|
||||
seq: 3
|
||||
}
|
||||
|
||||
post {
|
||||
url: {{api_url}}/games
|
||||
body: none
|
||||
auth: inherit
|
||||
}
|
||||
|
||||
settings {
|
||||
encodeUrl: true
|
||||
}
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
@@ -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',
|
||||
|
||||
@@ -102,6 +102,18 @@ export const useAPIStore = defineStore('api', () => {
|
||||
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,
|
||||
@@ -109,6 +121,8 @@ export const useAPIStore = defineStore('api', () => {
|
||||
getGames,
|
||||
getCurrentUserMatches,
|
||||
getCurrentUserTransactions,
|
||||
getCurrentUserStats,
|
||||
getLeaderboard,
|
||||
gameQueryParameters,
|
||||
}
|
||||
})
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
})
|
||||
@@ -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,
|
||||
}
|
||||
})
|
||||
@@ -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]];
|
||||
@@ -170,11 +216,11 @@ class BiscaGame {
|
||||
const finalLoser = isDraw
|
||||
? null
|
||||
: gameWinnerId == p1Obj.id
|
||||
? p2Obj.id
|
||||
: p1Obj.id;
|
||||
? p2Obj.id
|
||||
: p1Obj.id;
|
||||
|
||||
return {
|
||||
action: "game_ended",
|
||||
action: 'game_ended',
|
||||
trickResult,
|
||||
winnerId: finalWinner,
|
||||
loserId: finalLoser,
|
||||
@@ -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;
|
||||
|
||||
@@ -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`);
|
||||
});
|
||||
};
|
||||
|
||||
+154
-11
@@ -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,17 +196,37 @@ export default (io, socket) => {
|
||||
const GHOST_ID = 1;
|
||||
|
||||
if (game && game.players) {
|
||||
if (!game.players[user.id]) {
|
||||
if (game.players[GHOST_ID]) {
|
||||
delete game.players[GHOST_ID];
|
||||
game.players[user.id] = {
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
hand: [],
|
||||
points: 0,
|
||||
tricks: 0,
|
||||
};
|
||||
}
|
||||
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,
|
||||
name: user.name,
|
||||
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) {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"name": "websockets",
|
||||
"version": "1.0.0",
|
||||
"main": "index.js",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "nodemon index.js",
|
||||
"start": "bun index.js "
|
||||
|
||||
+12
-5
@@ -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);
|
||||
});
|
||||
});
|
||||
};
|
||||
@@ -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) => {
|
||||
activeGames.delete(id);
|
||||
console.log(`[Game State] Game removed: ${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 };
|
||||
|
||||
Reference in New Issue
Block a user