feat(ui): FRO-34 Lobby

Started Lobby Component

CHANGELOG.md

@@ -104,14 +104,3 @@
 
 * 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)
-## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.12.1...0.0.0) (2025-12-11)
-
-### Features
-
-* **ui:** FRO-35 Animations ([#22](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/22)) ([d73b4f3](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/d73b4f396be89b4f8ce2a446afe47c604cfe8598))
-## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.13.0...0.0.0) (2025-12-15)
-
-### Features
-
-* **ui:** FRO-34 Lobby ([#21](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/21)) ([bb6355d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/bb6355d9ed6745b4852a52040d880ee1dcc6d797))
-* **ui:** FRO-5 Animation Card Played ([#23](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/23)) ([70a44fd](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/70a44fd1ea119d43f875e6cfac56fb25747d8913))

env.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="vite/client" />
 
 declare global {
-  interface Window { __RUNTIME_CONFIG__?: { API_URL?: string; WEBSOCKET_URL?: string } }
+  interface Window { __RUNTIME_CONFIG__?: { API_URL?: string } }
 }
 
 export {};

package-lock.json

@@ -10,7 +10,6 @@
       "dependencies": {
         "@quasar/extras": "^1.17.0",
         "@tsparticles/vue3": "~3.0.1",
-        "animate.css": "^4.1.1",
         "axios": "^1.13.2",
         "pinia": "^3.0.4",
         "quasar": "^2.18.6",
@@ -74,6 +73,7 @@
       "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -2574,6 +2574,7 @@
       "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -2624,6 +2625,7 @@
       "integrity": "sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.48.1",
         "@typescript-eslint/types": "8.48.1",
@@ -2841,6 +2843,7 @@
       "integrity": "sha512-iHmwV3QcVGGvSC1BG5bZ4z6iwa1SOpAPWmnjOErd4Ske+lZua5K9TtAVdx0gMBClJ28DViCbSmZitjWZsWO3LA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rolldown/pluginutils": "1.0.0-beta.50"
       },
@@ -3227,6 +3230,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3268,12 +3272,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/animate.css": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
-      "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==",
-      "license": "MIT"
-    },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3318,6 +3316,7 @@
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
       "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -3400,6 +3399,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -3867,6 +3867,7 @@
       "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3927,6 +3928,7 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -3974,6 +3976,7 @@
       "integrity": "sha512-SbR9ZBUFKgvWAbq3RrdCtWaW0IKm6wwUiApxf3BVTNfqUIo4IQQmreMg2iHFJJ6C/0wss3LXURBJ1OwS/MhFcQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -4655,6 +4658,7 @@
       "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "jiti": "lib/jiti-cli.mjs"
       }
@@ -5340,6 +5344,7 @@
       "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -5384,6 +5389,7 @@
       "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.18.6.tgz",
       "integrity": "sha512-ZlK+vJXOBPSFDCNQDBDNwSI+AHoqaFPxK8ve6mhsYLhMKWI5b8zsGY9VU1xYjngO2aBvU4fvGWXy4tTbzrBk8Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 10.18.1",
         "npm": ">= 6.13.4",
@@ -6144,6 +6150,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -6248,6 +6255,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6378,6 +6386,7 @@
       "integrity": "sha512-tI2l/nFHC5rLh7+5+o7QjKjSR04ivXDF4jcgV0f/bTQ+OJiITy5S6gaynVsEM+7RqzufMnVbIon6Sr5x1SDYaQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -6628,6 +6637,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -6647,6 +6657,7 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.25.tgz",
       "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.25",
         "@vue/compiler-sfc": "3.5.25",

package.json

@@ -17,15 +17,14 @@
   },
   "dependencies": {
     "@quasar/extras": "^1.17.0",
-    "@tsparticles/vue3": "~3.0.1",
-    "animate.css": "^4.1.1",
-    "axios": "^1.13.2",
-    "pinia": "^3.0.4",
     "quasar": "^2.18.6",
-    "tsparticles": "~3.9.1",
     "vue": "^3.5.25",
+    "vue-router": "^4.6.3",
+    "tsparticles": "~3.9.1",
+    "@tsparticles/vue3": "~3.0.1",
+    "axios": "^1.13.2",
     "vue-axios": "^3.5.2",
-    "vue-router": "^4.6.3"
+    "pinia": "^3.0.4"
   },
   "devDependencies": {
     "@quasar/vite-plugin": "^1.10.0",

public/env.js

@@ -1,5 +1,4 @@
 window.__RUNTIME_CONFIG__ = {
-  API_URL: "http://localhost:9000",
+  API_URL: "http://localhost:9000"
-  WEBSOCKET_API_URL: "ws://localhost:9000/websocket"
 };
 

public/env.template.js

@@ -1,5 +1,4 @@
 window.__RUNTIME_CONFIG__ = {
-  API_URL: "${API_URL}",
+  API_URL: "${API_URL}"
-  WEBSOCKET_API_URL: "${WEBSOCKET_API_URL}"
 };
 

src/components/Ingame.vue

@@ -13,45 +13,38 @@ const ig = useIngame()
 </script>
 
 <template>
-  <q-layout>
+  <q-page class="game-field-background vh-100 ingame-side-shadow">
-    <q-page-container>
+    <div class="py-5 container-xxl">
-      <q-page class="game-field-background vh-100 ingame-side-shadow">
-        <div class="py-5 container-xxl">
 
-          <div class="fit row wrap justify-center items-center content-start">
+      <q-row class="q-gutter-md q-mx-md">
-            <div class="mt-5 ml-4 self-start col-2">
+        <q-col cols="4" class="mt-5 text-start">
-              <TurnC v-if="(ig.data as GameInfo)?.playerQueue" :queue="(ig.data as GameInfo).playerQueue!"/>
+          <TurnC v-if="(ig.data as GameInfo)?.playerQueue" :queue="(ig.data as GameInfo).playerQueue!"/>
-            </div>
+        </q-col>
 
-            <div class="text-center col-6">
+        <q-col cols="4" class="text-center">
-              <ScoreboardC v-if="(ig.data as GameInfo)?.currentRound" :current-round="(ig.data as GameInfo).currentRound!" />
+          <ScoreboardC v-if="(ig.data as GameInfo)?.currentRound" :current-round="(ig.data as GameInfo).currentRound!" />
-            </div>
 
-
+          <div class="d-flex justify-content-center g-3 mb-5">
-            <div class="mt-5 ml-4 self-end col-2" style="margin-left: 6em">
+            <PlayedCardsC v-if="(ig.data as GameInfo)?.currentTrick" :trick="(ig.data as GameInfo).currentTrick!" />
-              <GameInfoC v-if="(ig.data as GameInfo)?.currentRound"
-                         :first-card="(ig.data as GameInfo).currentTrick?.firstCard ?? null"
-                         :trumpsuit="(ig.data as GameInfo).currentRound!.trumpSuit"/>
-            </div>
           </div>
+        </q-col>
 
-          <div class="fit row wrap justify-center items-center content-start">
-            <div class="mt-4 ml-4 col-3 justify-content-center">
-              <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>
-            </div>
-          </div>
-          <div class="q-gutter-sm mt-4 bottom-div justify-content-center row" style="backdrop-filter: blur(4px); margin-left: 0; margin-right: 0;">
-            <div class="flex justify-center col-12">
-              <HandC v-if="(ig.data as GameInfo)?.hand && (ig.data as GameInfo)?.self"/>
-            </div>
-          </div>
 
-        </div>
+        <q-col cols="4" class="mt-5 text-end">
-      </q-page>
+          <GameInfoC v-if="(ig.data as GameInfo)?.currentRound"
-    </q-page-container>
+                     :first-card="(ig.data as GameInfo).currentTrick?.firstCard ?? null"
-  </q-layout>
+                     :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>
@@ -66,15 +59,4 @@ const ig = useIngame()
 .ingame-side-shadow {
   box-shadow: 0 1px 15px 0 #000000
 }
-.bottom-div {
-  position: fixed;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  max-width: 1400px;
-  width: 100%;
-  margin: 0;
-  text-align: center;
-  padding: 10px;
-}
 </style>

src/components/MainMenuBoxes.vue

@@ -39,20 +39,12 @@ const navigateTo = (routeName: string) => {
 </script>
 
 <template>
-  <transition-group
+  <div class="row q-col-gutter-md justify-center" style="width: 100%; max-width: 1000px;">
-    appear
-    enter-active-class="animate__animated animate__fadeIn"
-    leave-active-class="animate__animated animate__fadeOut"
 
-    tag="div"
-    class="row q-col-gutter-md justify-center"
-    style="width: 100%; max-width: 1000px;"
-  >
     <div
       v-for="(item, index) in menuItems"
       :key="index"
       class="col-12 col-sm-6 col-md-4"
-      :style="{ animationDuration: '1.6s', animationDelay: `${index * 0.3 + 0.5}s` }"
     >
       <q-card
         class="menu-card bg-dark text-white q-pa-sm cursor-pointer"
@@ -76,7 +68,7 @@ const navigateTo = (routeName: string) => {
         </q-card-section>
       </q-card>
     </div>
-  </transition-group>
+  </div>
 </template>
 
 <style scoped>
@@ -85,6 +77,7 @@ const navigateTo = (routeName: string) => {
   border: 1px solid rgba(255, 255, 255, 0.1);
 }
 
+/* Hover-Effekt für die Karten */
 .menu-card:hover {
   transform: translateY(-5px);
   background-color: #2c3e50 !important;

src/components/ingame/GameInfoC.vue

@@ -11,7 +11,7 @@ const {trumpsuit, firstCard} = toRefs(props)
 
 
 const trumpName = computed(() => {
-  switch (trumpsuit.value.identifier.charAt(1) as string) {
+  switch (trumpsuit.value.path.charAt(trumpsuit.value.path.length - 1)) {
     case 'S':
       return 'Spades'
     case 'H':
@@ -36,12 +36,14 @@ const trumpName = computed(() => {
 
     <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 rounded shadow-2"
+      <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;"/>
-        <q-img v-else src="/images/cards/1B.png" alt="First Card" class="firstbox"
+        <div v-else class="q-pa-sm"
-               style="width: 80px; border-radius: 6px;"/>
+             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>

src/components/ingame/HandC.vue

@@ -1,49 +1,45 @@
 <script lang="ts" setup>
+import {toRefs} from 'vue'
+import type {Hand, Player} from "@/types/GameSubTypes.ts";
 import {useWebSocket} from "@/composables/useWebsocket.ts";
-import {useIngame} from "@/composables/useIngame.ts";
-import type {GameInfo} from "@/types/GameTypes.ts";
-import {useQuasar} from "quasar";
-import { ref } from 'vue';
 
 const wb = useWebSocket()
-const wi = useIngame()
-const $q = useQuasar();
 
-const wiggleIdx = ref<number | null>(null)
+const props = defineProps<{
-let wiggleTimer: ReturnType<typeof setTimeout> | null = null
+  hand: Hand
+  isHandInactive?: boolean
+  self: Player | null
+}>()
 
-function triggerWiggle(index: number) {
+const { hand, isHandInactive, self } = toRefs(props)
-  // clear previous timer if any
-  if (wiggleTimer) clearTimeout(wiggleTimer)
-  wiggleIdx.value = index
-  wiggleTimer = setTimeout(() => {
-    wiggleIdx.value = null
-    wiggleTimer = null
-  }, 700)
-}
 
-function handlePlayCard(index: number | null) {
+function handlePlayCard(element: any, index: number | null) {
   if (index === null) return
+  if (isHandInactive?.value) return
+  isHandInactive.value = true
 
-  wb.sendAndWait("PlayCard", { cardindex: index }).catch((error) => {
+  const wiggleKeyframes = [
-      triggerWiggle(index)
+    { transform: 'translateX(0)' },
+    { transform: 'translateX(-5px)' },
+    { transform: 'translateX(5px)' },
+    { transform: 'translateX(-5px)' },
+    { transform: 'translateX(0)' }
+  ];
 
-      $q.notify({
+  const wiggleTiming = {
-        message: error.message,
+    duration: 400,
-        color: "negative",
+    iterations: 1,
-        position: "top"
+    easing: 'ease-in-out',
-      })
+    fill: 'forwards'
+  };
 
+  wb.sendAndWait("PlayCard", { cardindex: index })
+    .catch(() => {
+      element.animate(wiggleKeyframes, wiggleTiming);
+      isHandInactive.value = false;
     })
 }
-function onBeforeLeave(el: Element) {
+
-  const element = el as HTMLElement;
-  const { marginLeft, marginTop, width, height } = window.getComputedStyle(element);
-  element.style.left = `${element.offsetLeft - parseFloat(marginLeft)}px`;
-  element.style.top = `${element.offsetTop - parseFloat(marginTop)}px`;
-  element.style.width = width;
-  element.style.height = height;
-}
 function handleSkipDogLife() {
   //TODO: Add some animation or feedback for skipping turn
 }
@@ -56,22 +52,16 @@ function getCardImagePath(cardPath: string) {
 </script>
 
 <template>
-  <div class="hand-container">
+  <div class="bottom-div hand-container">
-    <div id="card-slide" class="ingame-cards-slide">
+    <div id="card-slide" :class="'ingame-cards-slide ' + (isHandInactive ? 'inactive' : '' )">
-      <transition-group
+      <div class="cards-row">
-        tag="div"
+        <div v-for="card in hand.cards" :key="card.identifier" class="handcard">
-        class="cards-row"
+          <div class="card-btn" @click="handlePlayCard(this, card.idx)" aria-label="Play card">
-        name="card-move"
+            <q-img :src="getCardImagePath(card.path)" :alt="card.identifier" class="card" />
-        enter-active-class="animate__animated animate__fadeIn"
-        @before-leave="onBeforeLeave"
-        move-class="card-moving">
-        <div v-for="card in (<GameInfo>wi.data)?.hand?.cards" :key="card.identifier" :class="['handcard', { wiggle: wiggleIdx === card.idx }]">
-          <div class="card-btn" aria-label="Play card">
-            <q-img :src="getCardImagePath(card.path)" v-on:click="handlePlayCard(card.idx)" :alt="card.identifier" class="card" />
           </div>
         </div>
-      </transition-group>
+      </div>
-      <div v-if="(<GameInfo>wi.data)?.self?.dogLife" class="dog-actions">
+      <div v-if="self?.dogLife" class="dog-actions">
         <q-btn color="negative" label="Skip Turn" @click="handleSkipDogLife" />
       </div>
     </div>
@@ -129,18 +119,6 @@ function getCardImagePath(cardPath: string) {
   width:120px;
   border-radius:6px
 }
-.wiggle {
-  animation: wiggle 700ms ease-in-out;
-}
-
-@keyframes wiggle {
-  0% { transform: translateY(0) rotate(0deg); }
-  15% { transform: translateY(-8px) rotate(-6deg); }
-  35% { transform: translateY(0) rotate(6deg); }
-  55% { transform: translateY(-4px) rotate(-3deg); }
-  75% { transform: translateY(0) rotate(2deg); }
-  100% { transform: translateY(0) rotate(0deg); }
-}
 
 @media (max-height: 500px) {
   .card {
@@ -148,18 +126,4 @@ function getCardImagePath(cardPath: string) {
     border-radius: 4px;
   }
 }
-.card-moving {
-  transition: transform 0.5s ease;
-  transition-delay: 1s;
-}
-.card-move-leave-active {
-  position: absolute;
-  transition: all 0.5s ease;
-  pointer-events: none;
-}
-
-.card-move-leave-to {
-  opacity: 0;
-  transform: translateY(-400px);
-}
 </style>

src/components/ingame/PlayedCardsC.vue

@@ -6,15 +6,12 @@ const props = defineProps<{ trick: Trick }>()
 const {trick } = toRefs(props)
 
 const playedCards = computed(() => {
-  if (!trick.value) return []
+  return [...trick.value.cards].map(card => {
-  let result: { cardId: string, player: string }[] = []
+    return {
-  for (const key in trick.value.cards) {
+      cardId: card[1].path,
-    result.push({
+      player: card[0].name
-      cardId: trick.value.cards[key]?.path ?? '',
+    }
-      player: key
+  })
-    })
-  }
-  return result;
 })
 
 function getCardImagePath(cardPath: string) {

src/components/ingame/ScoreboardC.vue

@@ -1,18 +1,15 @@
 <script setup lang="ts">
 import type {Round} from "@/types/GameSubTypes.ts";
-import {computed, type ComputedRef} from "vue";
 
 interface PlayerScore { name: string; tricks: number }
 const props = defineProps<{ currentRound: Round }>()
-const playerScores: ComputedRef<PlayerScore[]> = computed(() => {
+const playerScores: PlayerScore[] = props.currentRound.playersIn.map(player => {
-  return props.currentRound.playersIn.map(player => {
+  return {
-    return {
+    name: player.name,
-      name: player.name,
+    tricks: props.currentRound.trickList.filter(trick => {
-      tricks: props.currentRound.trickList.filter(trick => {
+      return trick.winner?.id === player.id
-        return trick.winner?.id === player.id
+    }).length
-      }).length
+  }
-    }
-  })
 })
 </script>
 

src/components/ingame/TurnC.vue

@@ -1,26 +1,26 @@
 <script setup lang="ts">
-import {computed, toRefs} from 'vue'
+import { computed } from 'vue'
 import type {PlayerQueue} from "@/types/GameSubTypes.ts";
-import {useIngame} from "@/composables/useIngame.ts";
-import type {GameInfo} from "@/types/GameTypes.ts";
 
-const ig = useIngame()
+const props = defineProps<{
-const currentPlayer = computed(() => (<GameInfo>ig.data).playerQueue.currentPlayer)
+  queue: PlayerQueue
-const queue = computed(() => { return (<GameInfo>ig.data).playerQueue.queue ?? []})
+}>()
+
+const safeNextPlayers = computed(() => props.queue.players ?? [])
 </script>
 
 <template>
-  <q-card flat class="turn-tracker-container q-pa-md no-background">
+  <q-card flat class="turn-tracker-container q-pa-md">
     <q-card-section>
       <div class="text-subtitle2 q-mb-xs">Current Player</div>
       <div id="current-player-name" class="text-h6 text-weight-bold text-positive">{{
-          currentPlayer?.name
+          props.queue.currentPlayer?.name
         }}</div>
 
-      <div v-if="queue.length > 0" class="q-mt-md">
+      <div v-if="safeNextPlayers.length > 0" class="q-mt-md">
         <div id="next-players-text" class="text-subtitle2 q-mb-xs">Next Players</div>
         <q-list id="next-players-container" dense>
-          <q-item v-for="player in queue" :key="player.id">
+          <q-item v-for="player in safeNextPlayers" :key="player.id">
             <q-item-section>
               <div class="text-body1 text-primary">{{ player.name }}</div>
             </q-item-section>
@@ -35,7 +35,4 @@ const queue = computed(() => { return (<GameInfo>ig.data).playerQueue.queue ?? [
 .turn-tracker-container {
   max-width: 320px;
 }
-.no-background {
-  background: none !important;
-}
 </style>

src/components/lobby/LobbyComponent.vue

@@ -1,63 +1,38 @@
 <script setup lang="ts">
-import type {User} from "@/types/GameSubTypes.ts";
-import {useIngame} from "@/composables/useIngame.ts";
 import type {LobbyInfo} from "@/types/GameTypes.ts";
-import {useWebSocket} from "@/composables/useWebsocket.ts";
+import type {User} from "@/types/GameSubTypes.ts";
-import {computed} from "vue";
-import router from "@/router";
-import {useQuasar} from "quasar";
 
-const wb = useWebSocket()
-const ig = useIngame();
-const $q = useQuasar();
 
-const maxPlayers = computed(() => (<LobbyInfo>ig.data).maxPlayers);
+const props = defineProps<{
-const isHost = computed(() => (<LobbyInfo>ig.data).self.host);
+  lobbyInfo: LobbyInfo
-const players = computed(() => {
+}>()
-  return (<LobbyInfo>ig.data).users;
+const emit = defineEmits<{
-})
+  (e: 'kick-player', user: User): void;
-const lobbyName = computed(() => {
+  (e: 'start-game'): void;
-  return `${ig.data?.gameId}`
+  (e: 'leave-game', user: User): void;
-});
+}>();
+
+const isHost = props.lobbyInfo.self.host;
+
+const players = props.lobbyInfo.users;
+
+const lobbyName = `${props.lobbyInfo.gameId}`;
 
 const handleKickPlayer = (user: User) => {
   if (isHost) {
-    wb.send("KickPlayer", {playerId: user.id})
+    emit('kick-player', user);
   }
 };
 
 const handleStartGame = () => {
   if (isHost) {
-    wb.sendAndWait("StartGame", {})
+    emit('start-game');
   }
 };
 
 const handleLeaveGame = (user: User) => {
-  wb.sendAndWait("LeaveGame", {user: user})
+  emit('leave-game', user);
 };
-
-wb.useEvent("SessionClosed", () => {
-  $q.notify({
-    message: `You left the lobby.`,
-    color: "positive"
-  })
-  router.replace("/")
-})
-wb.useEvent("LeftEvent", () => {
-  $q.notify({
-    message: `You left the lobby.`,
-    color: "positive"
-  })
-  router.replace("/")
-})
-
-wb.useEvent("KickEvent", () => {
-  $q.notify({
-    message: `You were kicked from the lobby!`,
-    color: "amber"
-  })
-  router.replace("/")
-})
 const profileIcon = 'person';
 </script>
 
@@ -69,14 +44,14 @@ const profileIcon = 'person';
       <q-btn
         color="negative"
         label="Exit"
-        @click="handleLeaveGame((<LobbyInfo>ig.data).self)"
+        @click="handleLeaveGame(props.lobbyInfo.self)"
         class="q-ml-auto"
       />
     </div>
 
     <div class="row q-pb-md">
       <div class="col text-center text-subtitle1">
-        Players: {{ players.length }} / {{ maxPlayers }}
+        Players: {{ players.length }} / {{ props.lobbyInfo.maxPlayers }}
       </div>
     </div>
 
@@ -90,7 +65,7 @@ const profileIcon = 'person';
 
               <q-card-section>
                 <div class="text-h6">
-                  {{ player.username }} <q-badge v-if="player.id === (<LobbyInfo>ig.data).self.id" color="orange" align="middle" class="q-ml-xs">
+                  {{ player.username }} <q-badge v-if="player.id === props.lobbyInfo.self.id" color="orange" align="middle" class="q-ml-xs">
                   (You)
                 </q-badge>
                   <q-badge v-else-if="player.host" color="blue" align="middle" class="q-ml-xs">
@@ -101,10 +76,10 @@ const profileIcon = 'person';
 
               <q-card-actions align="center" v-if="isHost">
                 <q-btn
-                  v-if="player.id !== (<LobbyInfo>ig.data).self.id"
+                  v-if="player.id !== props.lobbyInfo.self.id"
                   color="negative"
                   label="Remove"
-                  @click="handleKickPlayer(player)"
+                  @click="handleKickPlayer(props.lobbyInfo.self)"
                   class="full-width"
                 />
                 <q-btn

src/composables/useIngame.ts

@@ -2,7 +2,6 @@ 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";
-import {initWebSocket} from "@/services/ws.ts";
 
 const api = window?.__RUNTIME_CONFIG__?.API_URL;
 
@@ -15,8 +14,8 @@ export const useIngame = defineStore('ingame', () => {
     data.value = newData;
   }
 
-  async function requestGame(gameId: string) {
+  function requestGame(gameId: string) {
-    await axios.get(`${api}/status/${gameId}`, {withCredentials: true}).then((response) => {
+    axios.get(`${api}/status/${gameId}`, {withCredentials: true}).then((response) => {
       setIngame(response.data.state, response.data.data);
     });
   }

src/composables/useUserInfo.ts

@@ -18,15 +18,14 @@ export const useUserInfo = defineStore('userInfo', () => {
     gameId.value = id;
   }
 
-  async function requestState() {
+  function requestState() {
-    await axios.get(`${api}/status`, {withCredentials: true}).then((response) => {
+    axios.get(`${api}/status`, {withCredentials: true}).then((response) => {
       console.log("STATUS DATA:" + response.data.status + response.data.inGame)
       username.value = response.data.username;
-      if (response.data.gameId) {
+      if (response.data.ingame) {
-        console.log("GAMEID:" + response.data.gameId)
         gameId.value = response.data.gameId;
       }
-    })
+    });
   }
 
   function clearUserInfo() {

src/composables/useWebsocket.ts

@@ -37,12 +37,10 @@ export function useWebSocket() {
     };
 
     onMounted(() => {
-      console.log("Registering event handler for " + event);
       onEvent(event, wrapped);
     });
 
     onBeforeUnmount(() => {
-      console.log("Unregistering event handler for " + event);
       onEvent(event, () => {});
     });
   }

src/main.ts

@@ -12,7 +12,6 @@ import { createPinia } from 'pinia'
 import axios from 'axios'
 import VueAxios from 'vue-axios'
 import {useUserInfo} from "@/composables/useUserInfo.ts";
-import 'animate.css/animate.min.css';
 import {useIngame} from "@/composables/useIngame.ts";
 import {initWebSocket} from "@/services/ws.ts";
 
@@ -20,8 +19,8 @@ const app = createApp(App)
 const pinia = createPinia()
 
 app.use(pinia)
-const ui = useIngame();
+const ingameStore = useIngame();
-initWebSocket(ui);
+initWebSocket(ingameStore)
 app.use(router)
 app.use(Quasar, {
   plugins: {

src/router/index.ts

@@ -7,14 +7,15 @@ import defaultMenu from "../components/DefaultMenu.vue"
 import axios from "axios";
 import { useUserInfo } from "@/composables/useUserInfo";
 import rulesView from "../components/Rules.vue";
-import Game from "@/views/Game.vue";
+import LobbyView from "@/views/LobbyView.vue";
+import GameView from "@/views/Game.vue"
 const api = window?.__RUNTIME_CONFIG__?.API_URL;
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes: [
     {
-      path: '/',
+      path: '/mainmenu/',
       component: MainMenuView,
       meta: { requiresAuth: true },
       children: [
@@ -51,9 +52,9 @@ const router = createRouter({
       meta: { requiresAuth: false }
     },
     {
-      path: '/game',
+      path: '/lobby',
-      name: 'game',
+      name: 'lobby',
-      component: Game,
+      component: LobbyView,
       meta: {requiresAuth: true }
     }
   ],

src/runtimeConfig.ts

@@ -2,18 +2,13 @@
 // Reads runtime configuration injected into window.__RUNTIME_CONFIG__ (created by env.js at container start)
 
 declare global {
-  interface Window { __RUNTIME_CONFIG__?: { API_URL?: string; WEBSOCKET_URL?: string } }
+  interface Window { __RUNTIME_CONFIG__?: { API_URL?: string } }
 }
 
 const runtime = (globalThis as any).__RUNTIME_CONFIG__ || {};
 
 export const API_URL = runtime.API_URL || (import.meta.env.VITE_API_URL as string) || 'http://localhost:9000';
-export const WEBSOCKET_URL = runtime.API_URL || (import.meta.env.VITE_WEBSOCKET_URL as string) || 'http://localhost:9000';
 
 export function getApiUrl(): string {
   return API_URL;
 }
-
-export function getWebsocketUrl(): string {
-  return WEBSOCKET_URL;
-}

src/services/ws.ts

@@ -1,8 +1,7 @@
 import {useIngame} from "@/composables/useIngame.ts";
 import type {GameInfo, LobbyInfo, TieInfo, TrumpInfo, WonInfo} from "@/types/GameTypes.ts";
-import router from "@/router";
 
-const api = "localhost:9000"
+const api = window.__RUNTIME_CONFIG__?.API_URL;
 
 // ---------- Types ---------------------------------------------------------
 
@@ -108,9 +107,7 @@ function setupSocketHandlers(socket: WebSocket) {
     }
 
     if (state && stateData) {
-      console.debug("[WS] State change:", state, stateData);
       if(uState) {
-        console.debug("[WS] State change cascade:", state, stateData);
         uState.setIngame(state, stateData);
       }
     }
@@ -167,7 +164,7 @@ function setupSocketHandlers(socket: WebSocket) {
     }
 
     // You redirect here — if you don’t want auto reconnect, keep as is.
-    router.replace("/");
+    location.href = "/mainmenu";
   };
 }
 

src/types/GameSubTypes.ts

@@ -16,7 +16,7 @@ type Player = {
 
 type PlayerQueue = {
   currentPlayer: Player | null
-  queue: Player[]
+  players: Player[]
 }
 
 type PodiumPlayer = {
@@ -34,7 +34,7 @@ type Round = {
 }
 
 type Trick = {
-  cards: { [key: string]: Card} | null
+  cards: Map<Player, Card>
   firstCard: Card | null
   winner: Player | null
 }

src/views/CreateGame.vue

@@ -26,7 +26,7 @@ const createGameQuasar = async () => {
       icon: 'check_circle',
       position: 'top'
     });
-    router.replace("/game")
+    router.push("/lobby")
   }).catch((err) => {
     console.log("ERROR:" + err)
   }).finally(() =>

src/views/Game.vue

@@ -1,40 +1,26 @@
-<script lang="ts" setup>
+<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 LobbyComponent from "@/components/lobby/LobbyComponent.vue";
-import {storeToRefs} from "pinia";
-import {useQuasar} from "quasar";
 import router from "@/router";
 
 const wb = useWebSocket()
 const ig = useIngame()
-const { state } = storeToRefs(ig)
 const ui = useUserInfo()
-const $q = useQuasar();
 
-
+ui.requestState()
-ui.requestState().then(() => {
+if (ui.gameId) {
-  if (ui.gameId == null) {
+  ig.requestGame(ui.gameId)
-    $q.notify({
+  wb.connect()
-      message: "You're not in any game!",
+} else {
-      color: "negative"
+  router.replace("/")
-
+}
-    })
-    router.replace("/")
-  } else {
-    ig.requestGame(ui.gameId).then(() => {
-      wb.connect()
-    })
-  }
-})
 </script>
 
 <template>
   <div class="lobby-background">
-    <Ingame v-if="state === 'InGame'"/>
+    <Ingame v-if="ig.state === 'InGame'" />
-    <lobby-component v-if="state === 'Lobby'"/>
   </div>
 </template>
 
@@ -42,6 +28,6 @@ ui.requestState().then(() => {
 .lobby-background {
   background-color: var(--body-background-color);
   width: 100%;
-  min-height: 100vh;
+  min-height:100vh;
 }
 </style>

src/views/JoinGameView.vue

@@ -22,7 +22,7 @@ const startGameQuasar = async() => {
       icon: 'check_circle',
       position: 'top'
     });
-    router.replace("/game")
+    router.push("/lobby")
   }).catch(() => {
     $q.notify({
       message: `Lobby "${lobbyCode.value}" nicht gefunden`,

src/views/LoginView.vue

@@ -80,7 +80,7 @@ const onSubmit = () => {
   loginError.value = ''
   axios.post(`${api}/login`, {username: username.value, password: password.value}, {withCredentials: true}).then((response) => {
     uInfo.setUserInfo(response.data.user.username, response.data.user.id)
-    router.push("/")
+    router.push("/mainmenu")
   }).catch(() => {
     loginError.value = 'Invalid username or password'
   }).finally(() =>

src/views/MainMenuView.vue

@@ -14,26 +14,10 @@ import UserStatusArea from '../components/User.vue'
     </q-header>
 
     <q-page-container>
-      <q-page class="flex justify-start items-center column q-pa-md">
+      <q-page class="flex justify-start items-center column q-pa-md"> <header class="text-center q-mb-xl q-mt-md"> <h1 class="game-title text-white q-my-none">
-
+        KnockOutWhist
-
+      </h1>
-          <header class="text-center q-mb-xl q-mt-md">
-            <transition
-              appear
-              enter-active-class="animate__fadeInDown"
-              leave-active-class="animate__fadeOutUp"
-            >
-              <div
-                class="animate__animated"
-                :style="{ animationDuration: '1.6s' }"
-              >
-          <h1 class="game-title text-white q-my-none">
-            KnockOutWhist
-          </h1>
-          </div>
-        </transition>
       </header>
-
         <router-view></router-view>
       </q-page>
     </q-page-container>

versions.env

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