Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Edd
|
b6845ee0ea | ||
 FernandoJVideira
|
3ba3487f81 |
@@ -9,12 +9,11 @@ class CoinTransactionType extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
// FIX: Disable auto-timestamps because the table doesn't have updated_at/created_at columns
|
||||
public $timestamps = false;
|
||||
|
||||
protected $fillable = [
|
||||
'name',
|
||||
'type',
|
||||
'description' // Include description if your table has it
|
||||
'description'
|
||||
];
|
||||
}
|
||||
|
||||
Generated
-2376
File diff suppressed because it is too large
Load Diff
@@ -15,7 +15,6 @@ const router = useRouter()
|
||||
const authStore = useAuthStore()
|
||||
const wsStore = useSocketStore()
|
||||
|
||||
// --- FIX: Flag to prevent double cancellation ---
|
||||
const isCancelling = ref(false)
|
||||
|
||||
const matchState = ref({
|
||||
@@ -53,16 +52,15 @@ const opponentHand = computed(() => {
|
||||
return Array.from({ length: count }, (_, i) => ({ id: `opp-${i}`, suit: 'back', rank: 0 }))
|
||||
})
|
||||
|
||||
// Timer
|
||||
watch(() => wsStore.gameState?.currentTurn, () => { startTimer() }, { deep: true })
|
||||
const startTimer = () => {
|
||||
if (timerInterval.value) clearInterval(timerInterval.value);
|
||||
timeLeft.value = 20;
|
||||
if(!wsStore.gameState) return;
|
||||
timerInterval.value = setInterval(() => {
|
||||
if(timeLeft.value > 0) timeLeft.value--;
|
||||
else clearInterval(timerInterval.value);
|
||||
}, 1000);
|
||||
if (timerInterval.value) clearInterval(timerInterval.value);
|
||||
timeLeft.value = 20;
|
||||
if (!wsStore.gameState) return;
|
||||
timerInterval.value = setInterval(() => {
|
||||
if (timeLeft.value > 0) timeLeft.value--;
|
||||
else clearInterval(timerInterval.value);
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
const handlePlayCard = (card) => {
|
||||
@@ -71,12 +69,12 @@ const handlePlayCard = (card) => {
|
||||
|
||||
const openSurrenderModal = () => { showSurrenderModal.value = true }
|
||||
const confirmSurrenderRound = () => {
|
||||
showSurrenderModal.value = false;
|
||||
if (wsStore.socket) wsStore.socket.emit('game:surrender', { matchId: matchState.value.id });
|
||||
showSurrenderModal.value = false;
|
||||
if (wsStore.socket) wsStore.socket.emit('game:surrender', { matchId: matchState.value.id });
|
||||
}
|
||||
const confirmSurrenderMatch = () => {
|
||||
showSurrenderModal.value = false;
|
||||
if (wsStore.socket) wsStore.socket.emit('match:surrender', { matchId: matchState.value.id });
|
||||
showSurrenderModal.value = false;
|
||||
if (wsStore.socket) wsStore.socket.emit('match:surrender', { matchId: matchState.value.id });
|
||||
}
|
||||
const closeRoundModal = () => { showRoundModal.value = false; }
|
||||
|
||||
@@ -103,7 +101,6 @@ const updateLocalState = (data) => {
|
||||
}
|
||||
}
|
||||
|
||||
// --- FIX: Cancel Match with Flag ---
|
||||
const cancelMatch = async () => {
|
||||
if (isCancelling.value) return;
|
||||
isCancelling.value = true;
|
||||
@@ -112,12 +109,11 @@ const cancelMatch = async () => {
|
||||
await axios.delete(`${API_BASE_URL}/matches/${matchState.value.id}`)
|
||||
router.push({ name: 'home' })
|
||||
} catch (e) {
|
||||
// Ignore 404s if we just deleted it
|
||||
if (e.response && e.response.status === 404) {
|
||||
router.push({ name: 'home' })
|
||||
router.push({ name: 'home' })
|
||||
} else {
|
||||
isCancelling.value = false; // Reset if legitimate error
|
||||
alert(e.message)
|
||||
isCancelling.value = false;
|
||||
alert(e.message)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -131,28 +127,25 @@ const handleBeforeUnload = (e) => {
|
||||
}
|
||||
}
|
||||
|
||||
// --- FIX: Router Guard checks Flag ---
|
||||
onBeforeRouteLeave((to, from, next) => {
|
||||
// If we already clicked cancel, just let it go
|
||||
if (isCancelling.value) {
|
||||
return next();
|
||||
}
|
||||
|
||||
if (matchState.value.status === 'Playing' && !matchOver.value) {
|
||||
if (confirm("⚠️ WARNING: Leaving now triggers an automatic match surrender (Loss).\n\nAre you sure?")) {
|
||||
if(wsStore.socket) wsStore.socket.emit('match:surrender', { matchId: matchState.value.id });
|
||||
if (wsStore.socket) wsStore.socket.emit('match:surrender', { matchId: matchState.value.id });
|
||||
next();
|
||||
} else {
|
||||
next(false);
|
||||
}
|
||||
} else if (isPending.value && amIHost.value) {
|
||||
if(confirm("Cancel this lobby?")) {
|
||||
// Mark as cancelling so we don't trigger double requests if cancelMatch is weird
|
||||
isCancelling.value = true;
|
||||
cancelMatch().then(() => next());
|
||||
} else {
|
||||
next(false);
|
||||
}
|
||||
if (confirm("Cancel this lobby?")) {
|
||||
isCancelling.value = true;
|
||||
cancelMatch().then(() => next());
|
||||
} else {
|
||||
next(false);
|
||||
}
|
||||
} else {
|
||||
next();
|
||||
}
|
||||
@@ -179,22 +172,22 @@ onMounted(async () => {
|
||||
wsStore.socket.on('match:ended', updateLocalState)
|
||||
wsStore.socket.on('game:update', (state) => { wsStore.gameState = state })
|
||||
wsStore.socket.on('game:trick-end', (result) => {
|
||||
lastTrickWinner.value = result.winnerId;
|
||||
showTrickResult.value = true;
|
||||
setTimeout(() => { showTrickResult.value = false }, 2000);
|
||||
lastTrickWinner.value = result.winnerId;
|
||||
showTrickResult.value = true;
|
||||
setTimeout(() => { showTrickResult.value = false }, 2000);
|
||||
});
|
||||
wsStore.socket.on('match:round-ended', (data) => {
|
||||
const myPoints = data.winnerId == myUserId.value ? (data.winnerId == matchState.value.player1.id ? data.p1Points : data.p2Points) : (data.winnerId == matchState.value.player1.id ? data.p2Points : data.p1Points);
|
||||
const oppPoints = data.winnerId != myUserId.value ? (data.winnerId == matchState.value.player1.id ? data.p1Points : data.p2Points) : (data.winnerId == matchState.value.player1.id ? data.p2Points : data.p1Points);
|
||||
const myPoints = data.winnerId == myUserId.value ? (data.winnerId == matchState.value.player1.id ? data.p1Points : data.p2Points) : (data.winnerId == matchState.value.player1.id ? data.p2Points : data.p1Points);
|
||||
const oppPoints = data.winnerId != myUserId.value ? (data.winnerId == matchState.value.player1.id ? data.p1Points : data.p2Points) : (data.winnerId == matchState.value.player1.id ? data.p2Points : data.p1Points);
|
||||
|
||||
roundData.value = {
|
||||
winnerId: data.winnerId,
|
||||
marksAdded: data.marksAdded,
|
||||
myPoints: myPoints,
|
||||
oppPoints: oppPoints,
|
||||
reason: data.reason
|
||||
};
|
||||
showRoundModal.value = true;
|
||||
roundData.value = {
|
||||
winnerId: data.winnerId,
|
||||
marksAdded: data.marksAdded,
|
||||
myPoints: myPoints,
|
||||
oppPoints: oppPoints,
|
||||
reason: data.reason
|
||||
};
|
||||
showRoundModal.value = true;
|
||||
});
|
||||
}
|
||||
})
|
||||
@@ -218,7 +211,8 @@ onUnmounted(() => {
|
||||
<div class="flex flex-col items-start">
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="font-bold text-lg text-white drop-shadow-md">{{ myDisplayName }}</span>
|
||||
<span v-if="matchState.wager > 0" class="flex items-center text-xs text-yellow-300 bg-yellow-900/50 px-2 rounded border border-yellow-700/50">
|
||||
<span v-if="matchState.wager > 0"
|
||||
class="flex items-center text-xs text-yellow-300 bg-yellow-900/50 px-2 rounded border border-yellow-700/50">
|
||||
<Coins class="w-3 h-3 mr-1" /> {{ matchState.wager }}
|
||||
</span>
|
||||
</div>
|
||||
@@ -229,7 +223,8 @@ onUnmounted(() => {
|
||||
</div>
|
||||
<div class="flex flex-col items-center">
|
||||
<span class="text-[10px] uppercase tracking-widest text-green-400 font-bold">Match #{{ matchState.id }}</span>
|
||||
<span class="text-2xl font-black font-mono text-white drop-shadow-md">{{ matchState.myMarks }} - {{ matchState.oppMarks }}</span>
|
||||
<span class="text-2xl font-black font-mono text-white drop-shadow-md">{{ matchState.myMarks }} - {{
|
||||
matchState.oppMarks }}</span>
|
||||
</div>
|
||||
<div class="flex flex-col items-end">
|
||||
<span class="font-bold text-lg text-white drop-shadow-md">{{ opponentDisplayName }}</span>
|
||||
@@ -242,119 +237,135 @@ onUnmounted(() => {
|
||||
</div>
|
||||
|
||||
<div v-if="wsStore.gameState && !matchOver" class="absolute top-24 right-4 z-50">
|
||||
<button @click="openSurrenderModal" class="bg-red-600 hover:bg-red-700 text-white font-bold py-2 px-4 rounded-lg shadow-lg border-2 border-red-800 transition-all hover:scale-105 flex items-center gap-2 text-sm cursor-pointer">
|
||||
<button @click="openSurrenderModal"
|
||||
class="bg-red-600 hover:bg-red-700 text-white font-bold py-2 px-4 rounded-lg shadow-lg border-2 border-red-800 transition-all hover:scale-105 flex items-center gap-2 text-sm cursor-pointer">
|
||||
<span>🏳️</span> Surrender
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div v-if="wsStore.gameState && !matchOver && isMyTurn" class="absolute top-24 left-1/2 -translate-x-1/2 z-50">
|
||||
<div class="bg-gray-800 px-6 py-2 rounded-lg border-2 shadow-xl transition-colors duration-300" :class="timeLeft <= 5 ? 'border-red-500 bg-red-900/20' : 'border-gray-700'">
|
||||
<div class="bg-gray-800 px-6 py-2 rounded-lg border-2 shadow-xl transition-colors duration-300"
|
||||
:class="timeLeft <= 5 ? 'border-red-500 bg-red-900/20' : 'border-gray-700'">
|
||||
<div class="flex items-center gap-3">
|
||||
<svg class="w-5 h-5" :class="timeLeft <= 5 ? 'text-red-500 animate-bounce' : 'text-white'" viewBox="0 0 24 24" fill="none" stroke="currentColor">
|
||||
<svg class="w-5 h-5" :class="timeLeft <= 5 ? 'text-red-500 animate-bounce' : 'text-white'" viewBox="0 0 24 24"
|
||||
fill="none" stroke="currentColor">
|
||||
<circle cx="12" cy="12" r="10" stroke-width="2" />
|
||||
<polyline points="12 6 12 12 16 14" stroke-width="2" />
|
||||
</svg>
|
||||
<span :class="['text-2xl font-mono font-bold', timeLeft <= 5 ? 'text-red-500' : 'text-white']">{{ timeLeft }}</span>
|
||||
<span :class="['text-2xl font-mono font-bold', timeLeft <= 5 ? 'text-red-500' : 'text-white']">{{ timeLeft
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="pt-20 h-screen">
|
||||
<GameBoard
|
||||
v-if="wsStore.gameState && !matchOver"
|
||||
:game-id="matchState.currentGameId"
|
||||
@play-card="handlePlayCard"
|
||||
:trump-card="wsStore.gameState?.trumpCard"
|
||||
:cards-remaining="wsStore.gameState?.deckCount"
|
||||
:player-hand="wsStore.gameState?.hand"
|
||||
:opponent-hand="opponentHand"
|
||||
:player-score="wsStore.gameState?.points"
|
||||
:opponent-score="wsStore.gameState?.opponent?.points"
|
||||
:current-turn="currentTurnLabel"
|
||||
:current-trick="wsStore.gameState?.table"
|
||||
:is-my-turn="isMyTurn"
|
||||
:player-name="myDisplayName"
|
||||
:opponent-name="opponentDisplayName"
|
||||
/>
|
||||
<GameBoard v-if="wsStore.gameState && !matchOver" :game-id="matchState.currentGameId" @play-card="handlePlayCard"
|
||||
:trump-card="wsStore.gameState?.trumpCard" :cards-remaining="wsStore.gameState?.deckCount"
|
||||
:player-hand="wsStore.gameState?.hand" :opponent-hand="opponentHand" :player-score="wsStore.gameState?.points"
|
||||
:opponent-score="wsStore.gameState?.opponent?.points" :current-turn="currentTurnLabel"
|
||||
:current-trick="wsStore.gameState?.table" :is-my-turn="isMyTurn" :player-name="myDisplayName"
|
||||
:opponent-name="opponentDisplayName" />
|
||||
<div v-else-if="isPending" class="flex h-full items-center justify-center flex-col gap-6">
|
||||
<div class="text-center p-8 bg-green-800/60 rounded-2xl border border-green-600 shadow-2xl backdrop-blur-md max-w-sm w-full mx-4">
|
||||
<div
|
||||
class="text-center p-8 bg-green-800/60 rounded-2xl border border-green-600 shadow-2xl backdrop-blur-md max-w-sm w-full mx-4">
|
||||
<div class="relative mx-auto mb-6 h-16 w-16">
|
||||
<div class="absolute inset-0 rounded-full border-4 border-green-700/50"></div>
|
||||
<div class="absolute inset-0 rounded-full border-4 border-t-white border-r-transparent border-b-transparent border-l-transparent animate-spin"></div>
|
||||
<div class="absolute inset-0 rounded-full border-4 border-green-700/50"></div>
|
||||
<div
|
||||
class="absolute inset-0 rounded-full border-4 border-t-white border-r-transparent border-b-transparent border-l-transparent animate-spin">
|
||||
</div>
|
||||
</div>
|
||||
<h2 class="text-2xl font-bold mb-2 text-white">Waiting for Opponent</h2>
|
||||
<button v-if="amIHost" @click="cancelMatch" class="bg-red-600 hover:bg-red-700 text-white py-2 px-4 rounded shadow mt-4">Cancel Match</button>
|
||||
<button v-if="amIHost" @click="cancelMatch"
|
||||
class="bg-red-600 hover:bg-red-700 text-white py-2 px-4 rounded shadow mt-4">Cancel Match</button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else-if="!matchOver && !wsStore.gameState" class="flex h-full items-center justify-center flex-col gap-4">
|
||||
<div class="text-3xl font-bold animate-pulse text-white drop-shadow">Preparing next round...</div>
|
||||
</div>
|
||||
<div v-if="matchOver" class="absolute inset-0 z-50 flex items-center justify-center bg-black/80 backdrop-blur-md">
|
||||
<div class="text-center space-y-6 p-8 bg-green-900 border-2 border-green-500 rounded-2xl shadow-2xl max-w-md w-full">
|
||||
<div
|
||||
class="text-center space-y-6 p-8 bg-green-900 border-2 border-green-500 rounded-2xl shadow-2xl max-w-md w-full">
|
||||
<Trophy v-if="iWonMatch" class="w-24 h-24 text-yellow-400 mx-auto animate-bounce" />
|
||||
<Frown v-else class="w-24 h-24 text-green-300 mx-auto opacity-75" />
|
||||
<h1 class="text-5xl font-black uppercase mb-2" :class="iWonMatch ? 'text-yellow-400' : 'text-gray-300'">{{ iWonMatch ? 'Victory!' : 'Defeat' }}</h1>
|
||||
<p class="text-green-100 text-lg">Marks: <span class="font-bold">{{ matchState.myMarks }} - {{ matchState.oppMarks }}</span></p>
|
||||
<Button @click="leaveMatch" class="w-full py-6 text-lg bg-purple-600 hover:bg-purple-700">Return to Lobby</Button>
|
||||
<h1 class="text-5xl font-black uppercase mb-2" :class="iWonMatch ? 'text-yellow-400' : 'text-gray-300'">{{
|
||||
iWonMatch ? 'Victory!' : 'Defeat' }}</h1>
|
||||
<p class="text-green-100 text-lg">Marks: <span class="font-bold">{{ matchState.myMarks }} - {{
|
||||
matchState.oppMarks }}</span></p>
|
||||
<Button @click="leaveMatch" class="w-full py-6 text-lg bg-purple-600 hover:bg-purple-700">Return to
|
||||
Lobby</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="showRoundModal" class="fixed inset-0 z-[100] flex items-center justify-center bg-black/80 backdrop-blur-md">
|
||||
<div class="bg-gray-800 p-8 rounded-2xl border-2 border-yellow-500/50 shadow-2xl max-w-md w-full text-center relative overflow-hidden">
|
||||
<div class="absolute top-0 left-0 w-full h-2 bg-gradient-to-r from-transparent via-yellow-500 to-transparent"></div>
|
||||
<h2 class="text-3xl font-black text-white mb-2 uppercase">Round Over</h2>
|
||||
<p class="text-gray-400 mb-6 uppercase text-xs tracking-widest">{{ roundData.reason === 'surrender' ? 'Opponent Surrendered' : 'Points Limit Reached' }}</p>
|
||||
<div v-if="showRoundModal"
|
||||
class="fixed inset-0 z-[100] flex items-center justify-center bg-black/80 backdrop-blur-md">
|
||||
<div
|
||||
class="bg-gray-800 p-8 rounded-2xl border-2 border-yellow-500/50 shadow-2xl max-w-md w-full text-center relative overflow-hidden">
|
||||
<div class="absolute top-0 left-0 w-full h-2 bg-gradient-to-r from-transparent via-yellow-500 to-transparent">
|
||||
</div>
|
||||
<h2 class="text-3xl font-black text-white mb-2 uppercase">Round Over</h2>
|
||||
<p class="text-gray-400 mb-6 uppercase text-xs tracking-widest">
|
||||
{{ roundData.reason === 'surrender' ? 'Opponent Surrendered' : 'Points Limit Reached' }}</p>
|
||||
<div class="flex justify-between items-center bg-black/30 p-4 rounded-lg mb-6">
|
||||
<div class="text-left">
|
||||
<p class="text-xs text-gray-500 uppercase">You</p>
|
||||
<p class="text-2xl font-bold text-white">{{ roundData.myPoints }} pts</p>
|
||||
</div>
|
||||
<div class="text-xl font-bold text-yellow-500">VS</div>
|
||||
<div class="text-right">
|
||||
<p class="text-xs text-gray-500 uppercase">Opponent</p>
|
||||
<p class="text-2xl font-bold text-white">{{ roundData.oppPoints }} pts</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex justify-between items-center bg-black/30 p-4 rounded-lg mb-6">
|
||||
<div class="text-left">
|
||||
<p class="text-xs text-gray-500 uppercase">You</p>
|
||||
<p class="text-2xl font-bold text-white">{{ roundData.myPoints }} pts</p>
|
||||
</div>
|
||||
<div class="text-xl font-bold text-yellow-500">VS</div>
|
||||
<div class="text-right">
|
||||
<p class="text-xs text-gray-500 uppercase">Opponent</p>
|
||||
<p class="text-2xl font-bold text-white">{{ roundData.oppPoints }} pts</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-8">
|
||||
<p class="text-lg text-white" v-if="roundData.winnerId == myUserId">
|
||||
You won <span class="text-yellow-400 font-bold">+{{ roundData.marksAdded }} marks</span>!
|
||||
</p>
|
||||
<p class="text-lg text-white" v-else>
|
||||
Opponent won <span class="text-red-400 font-bold">+{{ roundData.marksAdded }} marks</span>.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="mb-8">
|
||||
<p class="text-lg text-white" v-if="roundData.winnerId == myUserId">
|
||||
You won <span class="text-yellow-400 font-bold">+{{ roundData.marksAdded }} marks</span>!
|
||||
</p>
|
||||
<p class="text-lg text-white" v-else>
|
||||
Opponent won <span class="text-red-400 font-bold">+{{ roundData.marksAdded }} marks</span>.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<button @click="closeRoundModal" class="w-full py-4 bg-emerald-600 hover:bg-emerald-500 text-white font-bold rounded-xl shadow-lg transition-transform hover:scale-105">
|
||||
Ready for Next Round
|
||||
</button>
|
||||
<button @click="closeRoundModal"
|
||||
class="w-full py-4 bg-emerald-600 hover:bg-emerald-500 text-white font-bold rounded-xl shadow-lg transition-transform hover:scale-105">
|
||||
Ready for Next Round
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="showSurrenderModal" class="fixed inset-0 z-[100] flex items-center justify-center bg-black/70 backdrop-blur-sm">
|
||||
<div v-if="showSurrenderModal"
|
||||
class="fixed inset-0 z-[100] flex items-center justify-center bg-black/70 backdrop-blur-sm">
|
||||
<div class="bg-gray-800 p-6 rounded-lg border border-gray-600 shadow-2xl max-w-sm w-full text-center">
|
||||
<h3 class="text-xl font-bold text-white mb-6">Surrender Options</h3>
|
||||
<div class="space-y-3">
|
||||
<button @click="confirmSurrenderRound" class="w-full px-4 py-3 bg-gray-700 hover:bg-gray-600 rounded text-white font-bold border border-gray-500 flex justify-between items-center group">
|
||||
<button @click="confirmSurrenderRound"
|
||||
class="w-full px-4 py-3 bg-gray-700 hover:bg-gray-600 rounded text-white font-bold border border-gray-500 flex justify-between items-center group">
|
||||
<span>Surrender Round</span>
|
||||
<span class="text-xs bg-black/40 px-2 py-1 rounded text-gray-300 group-hover:bg-red-500 group-hover:text-white">-2 Marks</span>
|
||||
<span
|
||||
class="text-xs bg-black/40 px-2 py-1 rounded text-gray-300 group-hover:bg-red-500 group-hover:text-white">-2
|
||||
Marks</span>
|
||||
</button>
|
||||
<button @click="confirmSurrenderMatch" class="w-full px-4 py-3 bg-red-900/50 hover:bg-red-600 rounded text-red-200 hover:text-white font-bold border border-red-800 flex justify-between items-center group">
|
||||
<button @click="confirmSurrenderMatch"
|
||||
class="w-full px-4 py-3 bg-red-900/50 hover:bg-red-600 rounded text-red-200 hover:text-white font-bold border border-red-800 flex justify-between items-center group">
|
||||
<span>Surrender Match</span>
|
||||
<span class="text-xs bg-black/40 px-2 py-1 rounded text-red-300 group-hover:bg-red-800 group-hover:text-white">Defeat</span>
|
||||
<span
|
||||
class="text-xs bg-black/40 px-2 py-1 rounded text-red-300 group-hover:bg-red-800 group-hover:text-white">Defeat</span>
|
||||
</button>
|
||||
</div>
|
||||
<button @click="showSurrenderModal = false" class="mt-6 text-gray-400 hover:text-white text-sm underline">Cancel</button>
|
||||
<button @click="showSurrenderModal = false"
|
||||
class="mt-6 text-gray-400 hover:text-white text-sm underline">Cancel</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Transition enter-active-class="transition-all duration-300 ease-out" enter-from-class="opacity-0 scale-50" enter-to-class="opacity-100 scale-100" leave-active-class="transition-all duration-200 ease-in" leave-from-class="opacity-100 scale-100" leave-to-class="opacity-0 scale-75">
|
||||
<Transition enter-active-class="transition-all duration-300 ease-out" enter-from-class="opacity-0 scale-50"
|
||||
enter-to-class="opacity-100 scale-100" leave-active-class="transition-all duration-200 ease-in"
|
||||
leave-from-class="opacity-100 scale-100" leave-to-class="opacity-0 scale-75">
|
||||
<div v-if="showTrickResult" class="fixed top-1/3 left-1/2 -translate-x-1/2 z-[70] pointer-events-none">
|
||||
<div class="bg-black/70 backdrop-blur-md px-8 py-4 rounded-2xl border border-white/10 shadow-2xl text-center">
|
||||
<p class="text-sm uppercase tracking-widest text-gray-300 font-bold mb-1">Trick Winner</p>
|
||||
<h2 class="text-3xl font-black" :class="lastTrickWinner === myUserId ? 'text-green-400' : 'text-red-400'">{{ lastTrickWinner === myUserId ? 'YOU' : 'OPPONENT' }}</h2>
|
||||
<p class="text-sm uppercase tracking-widest text-gray-300 font-bold mb-1">Trick Winner</p>
|
||||
<h2 class="text-3xl font-black" :class="lastTrickWinner === myUserId ? 'text-green-400' : 'text-red-400'">{{
|
||||
lastTrickWinner === myUserId ? 'YOU' : 'OPPONENT' }}</h2>
|
||||
</div>
|
||||
</div>
|
||||
</Transition>
|
||||
|
||||
@@ -4,7 +4,6 @@ import { ref, onMounted, nextTick, inject, computed } from 'vue'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Switch } from '@/components/ui/switch'
|
||||
import { watch } from 'vue';
|
||||
import {
|
||||
Card,
|
||||
@@ -35,9 +34,6 @@ const mObserver = ref(null);
|
||||
const mLoading = ref(false);
|
||||
const mPage = 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)
|
||||
@@ -211,9 +207,7 @@ const startSingle = () => {
|
||||
router.push({ name: 'bisca' + selectedMode.value });
|
||||
}
|
||||
|
||||
// --- FIX: Correct Wager Logic ---
|
||||
const joinMatch = async (match) => {
|
||||
// Use 'stake' because that's what the API returns
|
||||
const cost = match.stake || match.wager || 0;
|
||||
|
||||
if (cost > userCoins.value) {
|
||||
@@ -365,7 +359,8 @@ onMounted(async () => {
|
||||
</CardHeader>
|
||||
<CardContent class="space-y-6">
|
||||
<div class="flex justify-center">
|
||||
<Button @click="startSingle()" size="lg" variant="secondary" class="hover:bg-purple-500 hover:text-slate-200">
|
||||
<Button @click="startSingle()" size="lg" variant="secondary"
|
||||
class="hover:bg-purple-500 hover:text-slate-200">
|
||||
Start Game
|
||||
</Button>
|
||||
</div>
|
||||
@@ -381,8 +376,10 @@ onMounted(async () => {
|
||||
|
||||
<div class="flex flex-col flex-1">
|
||||
<div class="flex justify-between items-end mb-2">
|
||||
<label class="text-sm font-bold uppercase tracking-wider text-muted-foreground">Open Matches (Best of 3)</label>
|
||||
<Button v-if="isLoggedIn" @click="openHostModal(true)" size="sm" variant="outline" class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white font-bold">
|
||||
<label class="text-sm font-bold uppercase tracking-wider text-muted-foreground">Open Matches (Best of
|
||||
3)</label>
|
||||
<Button v-if="isLoggedIn" @click="openHostModal(true)" size="sm" variant="outline"
|
||||
class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white font-bold">
|
||||
Host
|
||||
</Button>
|
||||
</div>
|
||||
@@ -394,17 +391,20 @@ onMounted(async () => {
|
||||
<div v-for="(match, index) in openMatches" :key="match.id" @click="joinMatch(match)"
|
||||
class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
|
||||
<div class="flex items-center gap-3">
|
||||
<div class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-red-100 text-red-700">
|
||||
<div
|
||||
class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-red-100 text-red-700">
|
||||
{{ index + 1 }}
|
||||
</div>
|
||||
<div>
|
||||
<div class="font-medium text-sm flex items-center gap-2">
|
||||
Match #{{ match.id }}
|
||||
<span class="flex items-center text-xs bg-yellow-100 text-yellow-700 px-2 py-0.5 rounded-full">
|
||||
<span
|
||||
class="flex items-center text-xs bg-yellow-100 text-yellow-700 px-2 py-0.5 rounded-full">
|
||||
<Coins class="w-3 h-3 mr-1" /> {{ match.stake || match.wager }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="text-[10px] text-muted-foreground">Host: {{ match.player1?.nickname || 'Unknown' }}</div>
|
||||
<div class="text-[10px] text-muted-foreground">Host: {{ match.player1?.nickname || 'Unknown' }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -417,8 +417,10 @@ onMounted(async () => {
|
||||
|
||||
<div class="flex flex-col flex-1">
|
||||
<div class="flex justify-between items-end mb-2">
|
||||
<label class="text-sm font-medium uppercase tracking-wider text-muted-foreground">Open Games (Single)</label>
|
||||
<Button v-if="isLoggedIn" @click="openHostModal(false)" size="sm" variant="outline" class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white font-bold">
|
||||
<label class="text-sm font-medium uppercase tracking-wider text-muted-foreground">Open Games
|
||||
(Single)</label>
|
||||
<Button v-if="isLoggedIn" @click="openHostModal(false)" size="sm" variant="outline"
|
||||
class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white font-bold">
|
||||
Host
|
||||
</Button>
|
||||
</div>
|
||||
@@ -430,7 +432,8 @@ onMounted(async () => {
|
||||
<div v-for="(game, index) in openGames" :key="game.id" @click="joinGame(game)"
|
||||
class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
|
||||
<div class="flex items-center gap-3">
|
||||
<div class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-green-100 text-green-700">
|
||||
<div
|
||||
class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-green-100 text-green-700">
|
||||
{{ index + 1 }}
|
||||
</div>
|
||||
<div>
|
||||
@@ -450,9 +453,113 @@ onMounted(async () => {
|
||||
</div>
|
||||
</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 v-if="showHostModal" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm">
|
||||
<Card class="w-full max-w-sm border-purple-500 shadow-2xl">
|
||||
<CardHeader><CardTitle class="text-center">{{ isBestOfThree ? 'Host Match (Best of 3)' : 'Host Game' }}</CardTitle></CardHeader>
|
||||
<CardHeader>
|
||||
<CardTitle class="text-center">{{ isBestOfThree ? 'Host Match (Best of 3)' : 'Host Game' }}</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent class="flex flex-col gap-6 py-4">
|
||||
<div v-if="isBestOfThree" class="space-y-2">
|
||||
<Label>Wager (Coins)</Label>
|
||||
@@ -463,7 +570,8 @@ onMounted(async () => {
|
||||
<p class="text-xs text-muted-foreground text-right">Balance: {{ userCoins }}</p>
|
||||
</div>
|
||||
<div class="flex gap-2">
|
||||
<Button variant="outline" class="flex-1" @click="showHostModal = false" :disabled="hostLoading">Cancel</Button>
|
||||
<Button variant="outline" class="flex-1" @click="showHostModal = false"
|
||||
:disabled="hostLoading">Cancel</Button>
|
||||
<Button class="flex-1 bg-purple-600 hover:bg-purple-700" @click="hostGame" :disabled="hostLoading">
|
||||
{{ hostLoading ? 'Creating...' : 'Create' }}
|
||||
</Button>
|
||||
@@ -472,5 +580,16 @@ onMounted(async () => {
|
||||
</Card>
|
||||
</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>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -101,7 +101,7 @@ const handleFileChange = (event) => {
|
||||
}
|
||||
|
||||
const validateForm = () => {
|
||||
errors.value = {} // Reset errors
|
||||
errors.value = {}
|
||||
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,}))$/)) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -48,8 +48,6 @@ class BiscaGame {
|
||||
|
||||
this.dealInitialCards();
|
||||
|
||||
// --- FIX: Ensure currentTurn uses the original ID type (Number) ---
|
||||
// Object.keys returns strings ("1"), which breaks strict checks against user.id (1)
|
||||
const playerKeys = Object.keys(this.players);
|
||||
const startKey = playerKeys.find((key) => key != 1) || playerKeys[0];
|
||||
this.currentTurn = this.players[startKey].id;
|
||||
@@ -192,7 +190,6 @@ class BiscaGame {
|
||||
this.players[winnerId].tricks += 1;
|
||||
this.currentTurn = winnerId;
|
||||
|
||||
// --- FIX: Always draw if deck has cards (Removed type check) ---
|
||||
if (this.deck.length > 0 || this.trumpCard) {
|
||||
this.drawCard(winnerId);
|
||||
this.drawCard(this.getOpponentId(winnerId));
|
||||
@@ -222,8 +219,8 @@ class BiscaGame {
|
||||
const finalLoser = isDraw
|
||||
? null
|
||||
: gameWinnerId == p1Obj.id
|
||||
? p2Obj.id
|
||||
: p1Obj.id;
|
||||
? p2Obj.id
|
||||
: p1Obj.id;
|
||||
|
||||
const result = {
|
||||
action: "game_ended",
|
||||
|
||||
+2
-14
@@ -12,7 +12,7 @@ export const server = {
|
||||
const API_URL = "http://localhost:8000/api/v1";
|
||||
|
||||
const disconnectTimers = new Map();
|
||||
const RECONNECT_GRACE_PERIOD = 1 * 60 * 1000; // 1 minutes
|
||||
const RECONNECT_GRACE_PERIOD = 1 * 60 * 1000;
|
||||
|
||||
const userId = (socket) => socket.user && socket.user.id;
|
||||
|
||||
@@ -86,7 +86,6 @@ export const serverStart = (port) => {
|
||||
});
|
||||
|
||||
socket.on("disconnect", () => {
|
||||
// Remove from active socket list
|
||||
removeUser(socket.id);
|
||||
|
||||
if (socket.isVoluntaryDisconnect) {
|
||||
@@ -94,24 +93,15 @@ export const serverStart = (port) => {
|
||||
return;
|
||||
}
|
||||
|
||||
if (userId) {
|
||||
if (userId) {
|
||||
console.log(`[Disconnect] User ${userId} disconnected. Waiting ${RECONNECT_GRACE_PERIOD / 1000}s...`);
|
||||
|
||||
// -----------------------------------------------------------
|
||||
// 2. START SURRENDER TIMER
|
||||
// -----------------------------------------------------------
|
||||
const timer = setTimeout(async () => {
|
||||
console.log(`[Timeout] User ${userId} did not return. Forcing surrender.`);
|
||||
|
||||
// A. Find the Game ID this user is playing (You need a way to look this up)
|
||||
// Ideally, your 'socket' object or a global map knows which gameID the user is in.
|
||||
// For this example, let's assume you stored `socket.activeGameId` when they joined.
|
||||
const gameId = socket.activeGameId;
|
||||
|
||||
if (gameId) {
|
||||
try {
|
||||
// B. Call Laravel API to resign on their behalf
|
||||
// We use the token we saved during the handshake
|
||||
await axios.post(`${API_URL}/games/${gameId}/resign`, {}, {
|
||||
headers: {
|
||||
Authorization: socket.handshake.auth.token,
|
||||
@@ -119,8 +109,6 @@ export const serverStart = (port) => {
|
||||
}
|
||||
});
|
||||
|
||||
// C. Notify the room (The API likely triggers a Pusher/Socket event,
|
||||
// but we can also emit locally if needed)
|
||||
server.io.to(gameId).emit("game_over", {
|
||||
winner: "opponent",
|
||||
reason: "disconnect"
|
||||
|
||||
Reference in New Issue
Block a user