4 Commits

Author SHA1 Message Date
TeamCity
bda06a37cc ci: bump version to v0.12.1 2025-12-10 23:17:06 +00:00
39898ed03b feat/FRO-31: Added ingame (#20)
Force push of Janis ingame changes

Co-authored-by: Janis <janis.e.20@gmx.de>
Reviewed-on: #20
2025-12-11 00:15:50 +01:00
TeamCity
97b7df2a75 ci: bump version to v0.12.0 2025-12-10 19:32:59 +00:00
06f27d6813 feat: FRO-25 Create Game Info Component (#19)
Reviewed-on: #19
Co-authored-by: Janis <janis.e.20@gmx.de>
Co-committed-by: Janis <janis.e.20@gmx.de>
2025-12-10 20:31:36 +01:00
13 changed files with 274 additions and 15 deletions

View File

@@ -98,3 +98,9 @@
### Features ### Features
* **ui:** FRO-13 User Component ([#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/18)) ([f05f10e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/f05f10ea56b21f15cefbc76277ead5806eb1cf18)) * **ui:** FRO-13 User Component ([#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/18)) ([f05f10e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/f05f10ea56b21f15cefbc76277ead5806eb1cf18))
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.11.0...0.0.0) (2025-12-10)
### Features
* FRO-25 Create Game Info Component ([#19](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/19)) ([06f27d6](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/06f27d6813f625af25e734de3dcbcf07b10f3a1a))
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.12.0...0.0.0) (2025-12-10)

62
src/components/Ingame.vue Normal file
View File

@@ -0,0 +1,62 @@
<script setup lang="ts">
import {useIngame} from "@/composables/useIngame.ts";
import type {GameInfo} from "@/types/GameTypes.ts";
import HandC from "@/components/ingame/HandC.vue";
import GameInfoC from "@/components/ingame/GameInfoC.vue";
import PlayedCardsC from "@/components/ingame/PlayedCardsC.vue";
import ScoreboardC from "@/components/ingame/ScoreboardC.vue";
import TurnC from "@/components/ingame/TurnC.vue";
const ig = useIngame()
</script>
<template>
<q-page class="game-field-background vh-100 ingame-side-shadow">
<div class="py-5 container-xxl">
<q-row class="q-gutter-md q-mx-md">
<q-col cols="4" class="mt-5 text-start">
<TurnC v-if="(ig.data as GameInfo)?.playerQueue" :queue="(ig.data as GameInfo).playerQueue!"/>
</q-col>
<q-col cols="4" class="text-center">
<ScoreboardC v-if="(ig.data as GameInfo)?.currentRound" :current-round="(ig.data as GameInfo).currentRound!" />
<div class="d-flex justify-content-center g-3 mb-5">
<PlayedCardsC v-if="(ig.data as GameInfo)?.currentTrick" :trick="(ig.data as GameInfo).currentTrick!" />
</div>
</q-col>
<q-col cols="4" class="mt-5 text-end">
<GameInfoC v-if="(ig.data as GameInfo)?.currentRound"
:first-card="(ig.data as GameInfo).currentTrick?.firstCard ?? null"
:trumpsuit="(ig.data as GameInfo).currentRound!.trumpSuit"/>
</q-col>
</q-row>
<q-row justify="center" class="q-gutter-sm mt-4 bottom-div" style="backdrop-filter: blur(4px); margin-left: 0; margin-right: 0;">
<q-col cols="12" class="flex justify-center">
<HandC v-if="(ig.data as GameInfo)?.hand && (ig.data as GameInfo)?.self" :hand="(ig.data as GameInfo).hand!" :self="(ig.data as GameInfo).self"/>
</q-col>
</q-row>
</div>
</q-page>
</template>
<style scoped>
.game-field-background {
background-image: var(--body-background-color);
background-repeat: no-repeat;
background-size: cover;
max-width: 1400px;
margin: 0 auto;
min-height: 100vh;
}
.ingame-side-shadow {
box-shadow: 0 1px 15px 0 #000000
}
</style>

View File

@@ -0,0 +1,57 @@
<script lang="ts" setup>
import type {Card} from "@/types/GameSubTypes.ts";
import {computed, toRefs} from "vue";
const props = defineProps<{
trumpsuit: Card
firstCard: Card | null
}>()
const {trumpsuit, firstCard} = toRefs(props)
const trumpName = computed(() => {
switch (trumpsuit.value.path.charAt(trumpsuit.value.path.length - 1)) {
case 'S':
return 'Spades'
case 'H':
return 'Hearts'
case 'D':
return 'Diamonds'
case 'C':
return 'Clubs'
default:
return 'Unknown'
}
})
</script>
<template>
<div>
<div class="q-mb-sm">
<div class="text-h6 q-mb-xs q-font-medium">Trumpsuit</div>
<div id="trumpsuit" class="text-h5 text-primary">{{ trumpName }}</div>
</div>
<div class="q-mt-md">
<div class="text-subtitle1 q-mb-xs q-font-medium">First Card</div>
<div id="first-card-container" class="q-pa-sm bg-grey-2 rounded shadow-2"
style="display:inline-block;">
<q-img v-if="firstCard" :src="firstCard.path" alt="First Card" class="firstbox"
style="width: 80px; border-radius: 6px;"/>
<div v-else class="q-pa-sm"
style="width: 80px; height: 120px; display:flex; align-items:center; justify-content:center; border-radius:6px; background: #ffffff; color: #666;">
No image
</div>
</div>
</div>
</div>
</template>
<style scoped>
.firstbox {
width: 80px;
border-radius: 6px;
}
</style>

View File

@@ -1,6 +1,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import {toRefs} from 'vue' import {toRefs} from 'vue'
import type {Hand, Player} from "@/types/GameSubTypes.ts"; import type {Hand, Player} from "@/types/GameSubTypes.ts";
import {useWebSocket} from "@/composables/useWebsocket.ts";
const wb = useWebSocket()
const props = defineProps<{ const props = defineProps<{
hand: Hand hand: Hand
@@ -8,21 +11,37 @@ const props = defineProps<{
self: Player | null self: Player | null
}>() }>()
const emit = defineEmits<{
(e: 'play-card', idx: number): void
(e: 'skip-dog'): void
}>()
const { hand, isHandInactive, self } = toRefs(props) const { hand, isHandInactive, self } = toRefs(props)
function handlePlayCard(idx: number | null) { function handlePlayCard(element: any, index: number | null) {
if (idx === null) return if (index === null) return
if (isHandInactive?.value) return if (isHandInactive?.value) return
emit('play-card', idx) isHandInactive.value = true
const wiggleKeyframes = [
{ transform: 'translateX(0)' },
{ transform: 'translateX(-5px)' },
{ transform: 'translateX(5px)' },
{ transform: 'translateX(-5px)' },
{ transform: 'translateX(0)' }
];
const wiggleTiming = {
duration: 400,
iterations: 1,
easing: 'ease-in-out',
fill: 'forwards'
};
wb.sendAndWait("PlayCard", { cardindex: index })
.catch(() => {
element.animate(wiggleKeyframes, wiggleTiming);
isHandInactive.value = false;
})
} }
function handleSkipDogLife() { function handleSkipDogLife() {
emit('skip-dog') //TODO: Add some animation or feedback for skipping turn
} }
function getCardImagePath(cardPath: string) { function getCardImagePath(cardPath: string) {
@@ -37,7 +56,7 @@ function getCardImagePath(cardPath: string) {
<div id="card-slide" :class="'ingame-cards-slide ' + (isHandInactive ? 'inactive' : '' )"> <div id="card-slide" :class="'ingame-cards-slide ' + (isHandInactive ? 'inactive' : '' )">
<div class="cards-row"> <div class="cards-row">
<div v-for="card in hand.cards" :key="card.identifier" class="handcard"> <div v-for="card in hand.cards" :key="card.identifier" class="handcard">
<div class="card-btn" @click="handlePlayCard(card.idx)" aria-label="Play card"> <div class="card-btn" @click="handlePlayCard(this, card.idx)" aria-label="Play card">
<q-img :src="getCardImagePath(card.path)" :alt="card.identifier" class="card" /> <q-img :src="getCardImagePath(card.path)" :alt="card.identifier" class="card" />
</div> </div>
</div> </div>

View File

@@ -0,0 +1,29 @@
import { defineStore } from 'pinia'
import {ref, type Ref} from 'vue'
import type {GameInfo, LobbyInfo, TieInfo, TrumpInfo, WonInfo} from "@/types/GameTypes.ts";
import axios from "axios";
const api = window?.__RUNTIME_CONFIG__?.API_URL;
export const useIngame = defineStore('ingame', () => {
const state: Ref<'Lobby' | 'InGame' | 'SelectTrump' | 'TieBreak' | 'FinishedMatch' | null> = ref(null);
const data: Ref<GameInfo | LobbyInfo | TieInfo | TrumpInfo | WonInfo | null> = ref(null);
function setIngame(newState: 'Lobby' | 'InGame' | 'SelectTrump' | 'TieBreak' | 'FinishedMatch', newData: GameInfo | LobbyInfo | TieInfo | TrumpInfo | WonInfo) {
state.value = newState;
data.value = newData;
}
function requestGame(gameId: string) {
axios.get(`${api}/status/${gameId}`, {withCredentials: true}).then((response) => {
setIngame(response.data.state, response.data.data);
});
}
function clearIngame() {
state.value = null;
data.value = null;
}
return { state, data, requestGame, setIngame, clearIngame };
});

View File

@@ -1,19 +1,40 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import {ref, type Ref} from 'vue' import {ref, type Ref} from 'vue'
import axios from "axios";
const api = window?.__RUNTIME_CONFIG__?.API_URL;
export const useUserInfo = defineStore('userInfo', () => { export const useUserInfo = defineStore('userInfo', () => {
const username: Ref<string | null> = ref(null); const username: Ref<string | null> = ref(null);
const userId: Ref<number | null> = ref(null); const userId: Ref<number | null> = ref(null);
const gameId: Ref<string | null> = ref(null);
function setUserInfo(name: string, id: number) { function setUserInfo(name: string, id: number) {
username.value = name; username.value = name;
userId.value = id; userId.value = id;
} }
function setGameId(id: string) {
gameId.value = id;
}
function requestState() {
axios.get(`${api}/status`, {withCredentials: true}).then((response) => {
username.value = response.data.username;
if (response.data.ingame) {
gameId.value = response.data.gameId;
}
});
}
function clearUserInfo() { function clearUserInfo() {
username.value = null; username.value = null;
userId.value = null; userId.value = null;
} }
return { username, userId, setUserInfo, clearUserInfo }; function clearGameId() {
gameId.value = null;
}
return { username, userId, gameId, setUserInfo, requestState, clearUserInfo, setGameId, clearGameId };
}); });

View File

@@ -6,8 +6,13 @@ import {
sendEventAndWait, sendEventAndWait,
onEvent, onEvent,
isWebSocketConnected, isWebSocketConnected,
setDefaultHandler,
} from "@/services/ws"; } from "@/services/ws";
function defaultEventHandler<T = any>(data: (data: T) => void) {
setDefaultHandler(data);
}
export function useWebSocket() { export function useWebSocket() {
const isConnected = ref(isWebSocketConnected()); const isConnected = ref(isWebSocketConnected());
const lastMessage = ref<any>(null); const lastMessage = ref<any>(null);
@@ -51,5 +56,6 @@ export function useWebSocket() {
sendAndWait: sendEventAndWait, sendAndWait: sendEventAndWait,
useEvent, useEvent,
defaultEventHandler
}; };
} }

View File

@@ -1,3 +1,6 @@
import {useIngame} from "@/composables/useIngame.ts";
import type {GameInfo, LobbyInfo, TieInfo, TrumpInfo, WonInfo} from "@/types/GameTypes.ts";
const api = window.__RUNTIME_CONFIG__?.API_URL; const api = window.__RUNTIME_CONFIG__?.API_URL;
// ---------- Types --------------------------------------------------------- // ---------- Types ---------------------------------------------------------
@@ -6,6 +9,8 @@ export type ServerMessage<T = any> = {
id?: string; id?: string;
event?: string; event?: string;
status?: "success" | "error"; status?: "success" | "error";
state?: "Lobby" | "InGame" | "SelectTrump" | "TieBreak" | "FinishedMatch";
stateData?: GameInfo | LobbyInfo | TieInfo | TrumpInfo | WonInfo;
data?: T; data?: T;
error?: string; error?: string;
}; };
@@ -28,9 +33,12 @@ let ws: WebSocket | null = null;
const pending = new Map<string, PendingEntry>(); const pending = new Map<string, PendingEntry>();
const handlers = new Map<string, HandlerFn>(); const handlers = new Map<string, HandlerFn>();
const uState = useIngame();
let heartbeatTimer: ReturnType<typeof setInterval> | null = null; let heartbeatTimer: ReturnType<typeof setInterval> | null = null;
let defaultHandler: HandlerFn | null = null;
function uuid(): string { function uuid(): string {
return crypto.randomUUID(); return crypto.randomUUID();
} }
@@ -73,7 +81,7 @@ function setupSocketHandlers(socket: WebSocket) {
return; return;
} }
const { id, event, status, data } = msg; const { id, event, state, stateData, status, data } = msg;
// RPC response branch // RPC response branch
if (id && status) { if (id && status) {
@@ -91,6 +99,10 @@ function setupSocketHandlers(socket: WebSocket) {
return; return;
} }
if (state && stateData) {
uState.setIngame(state, stateData);
}
// Server event → handler branch // Server event → handler branch
if (id && event) { if (id && event) {
const handler = handlers.get(event); const handler = handlers.get(event);
@@ -103,7 +115,17 @@ function setupSocketHandlers(socket: WebSocket) {
if (!handler) { if (!handler) {
console.warn("[WS] No handler for event:", event); console.warn("[WS] No handler for event:", event);
reply("error", `No handler for '${event}'`); if (defaultHandler) {
try {
await defaultHandler(data ?? {});
reply("success");
} catch (err) {
reply("error", (err as Error).message);
}
} else {
reply("error", `No handler for '${event}'`);
}
return; return;
} }
@@ -232,5 +254,9 @@ export function onEvent(event: string, handler: HandlerFn) {
handlers.set(event, handler); handlers.set(event, handler);
} }
export function setDefaultHandler(handler: HandlerFn) {
defaultHandler = handler;
}
export const isWebSocketConnected = () => export const isWebSocketConnected = () =>
!!ws && ws.readyState === WebSocket.OPEN; !!ws && ws.readyState === WebSocket.OPEN;

33
src/views/Game.vue Normal file
View File

@@ -0,0 +1,33 @@
<script setup lang="ts">
import {useWebSocket} from "@/composables/useWebsocket.ts";
import {useIngame} from "@/composables/useIngame.ts";
import Ingame from "@/components/Ingame.vue";
import {useUserInfo} from "@/composables/useUserInfo.ts";
import router from "@/router";
const wb = useWebSocket()
const ig = useIngame()
const ui = useUserInfo()
ui.requestState()
if (ui.gameId) {
ig.requestGame(ui.gameId)
wb.connect()
} else {
router.replace("/")
}
</script>
<template>
<div class="lobby-background">
<Ingame v-if="ig.state === 'InGame'" />
</div>
</template>
<style scoped>
.lobby-background {
background-color: var(--body-background-color);
width: 100%;
min-height:100vh;
}
</style>

View File

@@ -1,3 +1,3 @@
MAJOR=0 MAJOR=0
MINOR=11 MINOR=12
PATCH=0 PATCH=1