ci: bump version to v0.14.0

Added a fade Up Out animation. Also added a sliding animation for the remaining cards

Co-authored-by: LQ63 <lkhermann@web.de>
Reviewed-on: #23
Co-authored-by: lq64 <lq@blackhole.local>
Co-committed-by: lq64 <lq@blackhole.local>

CHANGELOG.md

@@ -103,3 +103,15 @@
 ### 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)
+## [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 } }
+  interface Window { __RUNTIME_CONFIG__?: { API_URL?: string; WEBSOCKET_URL?: string } }
 }
 
 export {};

package-lock.json

@@ -10,6 +10,7 @@
       "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",
@@ -73,7 +74,6 @@
       "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,7 +2574,6 @@
       "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -2625,7 +2624,6 @@
       "integrity": "sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.48.1",
         "@typescript-eslint/types": "8.48.1",
@@ -2843,7 +2841,6 @@
       "integrity": "sha512-iHmwV3QcVGGvSC1BG5bZ4z6iwa1SOpAPWmnjOErd4Ske+lZua5K9TtAVdx0gMBClJ28DViCbSmZitjWZsWO3LA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@rolldown/pluginutils": "1.0.0-beta.50"
       },
@@ -3230,7 +3227,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3272,6 +3268,12 @@
       "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",
@@ -3316,7 +3318,6 @@
       "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",
@@ -3399,7 +3400,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -3867,7 +3867,6 @@
       "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",
@@ -3928,7 +3927,6 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -3976,7 +3974,6 @@
       "integrity": "sha512-SbR9ZBUFKgvWAbq3RrdCtWaW0IKm6wwUiApxf3BVTNfqUIo4IQQmreMg2iHFJJ6C/0wss3LXURBJ1OwS/MhFcQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -4658,7 +4655,6 @@
       "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jiti": "lib/jiti-cli.mjs"
       }
@@ -5344,7 +5340,6 @@
       "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -5389,7 +5384,6 @@
       "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",
@@ -6150,7 +6144,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -6255,7 +6248,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6386,7 +6378,6 @@
       "integrity": "sha512-tI2l/nFHC5rLh7+5+o7QjKjSR04ivXDF4jcgV0f/bTQ+OJiITy5S6gaynVsEM+7RqzufMnVbIon6Sr5x1SDYaQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -6637,7 +6628,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -6657,7 +6647,6 @@
       "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,14 +17,15 @@
   },
   "dependencies": {
     "@quasar/extras": "^1.17.0",
-    "quasar": "^2.18.6",
-    "vue": "^3.5.25",
-    "vue-router": "^4.6.3",
-    "tsparticles": "~3.9.1",
     "@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-axios": "^3.5.2",
-    "pinia": "^3.0.4"
+    "vue-router": "^4.6.3"
   },
   "devDependencies": {
     "@quasar/vite-plugin": "^1.10.0",

public/env.js

@@ -1,4 +1,5 @@
 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,4 +1,5 @@
 window.__RUNTIME_CONFIG__ = {
-  API_URL: "${API_URL}"
+  API_URL: "${API_URL}",
+  WEBSOCKET_API_URL: "${WEBSOCKET_API_URL}"
 };
 

src/components/Ingame.vue

@@ -13,38 +13,45 @@ const ig = useIngame()
 </script>
 
 <template>
-  <q-page class="game-field-background vh-100 ingame-side-shadow">
+  <q-layout>
-    <div class="py-5 container-xxl">
+    <q-page-container>
+      <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">
+          <div class="fit row wrap justify-center items-center content-start">
-        <q-col cols="4" class="mt-5 text-start">
+            <div class="mt-5 ml-4 self-start col-2">
-          <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!"/>
-        </q-col>
+            </div>
 
-        <q-col cols="4" class="text-center">
+            <div class="text-center col-6">
-          <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">
+
-            <PlayedCardsC v-if="(ig.data as GameInfo)?.currentTrick" :trick="(ig.data as GameInfo).currentTrick!" />
+            <div class="mt-5 ml-4 self-end col-2" style="margin-left: 6em">
+              <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>
 
-        <q-col cols="4" class="mt-5 text-end">
+        </div>
-          <GameInfoC v-if="(ig.data as GameInfo)?.currentRound"
+      </q-page>
-                     :first-card="(ig.data as GameInfo).currentTrick?.firstCard ?? null"
+    </q-page-container>
-                     :trumpsuit="(ig.data as GameInfo).currentRound!.trumpSuit"/>
+  </q-layout>
-        </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>
@@ -59,4 +66,15 @@ 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,12 +39,20 @@ const navigateTo = (routeName: string) => {
 </script>
 
 <template>
-  <div class="row q-col-gutter-md justify-center" style="width: 100%; max-width: 1000px;">
+  <transition-group
+    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"
@@ -68,7 +76,7 @@ const navigateTo = (routeName: string) => {
         </q-card-section>
       </q-card>
     </div>
-  </div>
+  </transition-group>
 </template>
 
 <style scoped>
@@ -77,7 +85,6 @@ 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.path.charAt(trumpsuit.value.path.length - 1)) {
+  switch (trumpsuit.value.identifier.charAt(1) as string) {
     case 'S':
       return 'Spades'
     case 'H':
@@ -36,14 +36,12 @@ 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 bg-grey-2 rounded shadow-2"
+      <div id="first-card-container" class="q-pa-sm 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"
+        <q-img v-else src="/images/cards/1B.png" alt="First Card" class="firstbox"
-             style="width: 80px; height: 120px; display:flex; align-items:center; justify-content:center; border-radius:6px; background: #ffffff; color: #666;">
+               style="width: 80px; border-radius: 6px;"/>
-          No image
-        </div>
       </div>
     </div>
   </div>

src/components/ingame/HandC.vue

@@ -1,45 +1,49 @@
 <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 props = defineProps<{
+const wiggleIdx = ref<number | null>(null)
-  hand: Hand
+let wiggleTimer: ReturnType<typeof setTimeout> | null = null
-  isHandInactive?: boolean
-  self: Player | null
-}>()
 
-const { hand, isHandInactive, self } = toRefs(props)
+function triggerWiggle(index: number) {
-
+  // clear previous timer if any
-function handlePlayCard(element: any, index: number | null) {
+  if (wiggleTimer) clearTimeout(wiggleTimer)
-  if (index === null) return
+  wiggleIdx.value = index
-  if (isHandInactive?.value) return
+  wiggleTimer = setTimeout(() => {
-  isHandInactive.value = true
+    wiggleIdx.value = null
-
+    wiggleTimer = null
-  const wiggleKeyframes = [
+  }, 700)
-    { 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 handlePlayCard(index: number | null) {
+  if (index === null) return
+
+  wb.sendAndWait("PlayCard", { cardindex: index }).catch((error) => {
+      triggerWiggle(index)
+
+      $q.notify({
+        message: error.message,
+        color: "negative",
+        position: "top"
+      })
+
+    })
+}
+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
 }
@@ -52,16 +56,22 @@ function getCardImagePath(cardPath: string) {
 </script>
 
 <template>
-  <div class="bottom-div hand-container">
+  <div class="hand-container">
-    <div id="card-slide" :class="'ingame-cards-slide ' + (isHandInactive ? 'inactive' : '' )">
+    <div id="card-slide" class="ingame-cards-slide">
-      <div class="cards-row">
+      <transition-group
-        <div v-for="card in hand.cards" :key="card.identifier" class="handcard">
+        tag="div"
-          <div class="card-btn" @click="handlePlayCard(this, card.idx)" aria-label="Play card">
+        class="cards-row"
-            <q-img :src="getCardImagePath(card.path)" :alt="card.identifier" class="card" />
+        name="card-move"
+        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>
-      </div>
+      </transition-group>
-      <div v-if="self?.dogLife" class="dog-actions">
+      <div v-if="(<GameInfo>wi.data)?.self?.dogLife" class="dog-actions">
         <q-btn color="negative" label="Skip Turn" @click="handleSkipDogLife" />
       </div>
     </div>
@@ -119,6 +129,18 @@ 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 {
@@ -126,4 +148,18 @@ 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,12 +6,15 @@ const props = defineProps<{ trick: Trick }>()
 const {trick } = toRefs(props)
 
 const playedCards = computed(() => {
-  return [...trick.value.cards].map(card => {
+  if (!trick.value) return []
-    return {
+  let result: { cardId: string, player: string }[] = []
-      cardId: card[1].path,
+  for (const key in trick.value.cards) {
-      player: card[0].name
+    result.push({
-    }
+      cardId: trick.value.cards[key]?.path ?? '',
-  })
+      player: key
+    })
+  }
+  return result;
 })
 
 function getCardImagePath(cardPath: string) {

src/components/ingame/ScoreboardC.vue

@@ -1,15 +1,18 @@
 <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: PlayerScore[] = props.currentRound.playersIn.map(player => {
+const playerScores: ComputedRef<PlayerScore[]> = computed(() => {
-  return {
+  return props.currentRound.playersIn.map(player => {
-    name: player.name,
+    return {
-    tricks: props.currentRound.trickList.filter(trick => {
+      name: player.name,
-      return trick.winner?.id === player.id
+      tricks: props.currentRound.trickList.filter(trick => {
-    }).length
+        return trick.winner?.id === player.id
-  }
+      }).length
+    }
+  })
 })
 </script>
 

src/components/ingame/TurnC.vue

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

src/components/lobby/LobbyComponent.vue

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

src/composables/useIngame.ts

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

src/composables/useUserInfo.ts

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

src/composables/useWebsocket.ts

@@ -37,10 +37,12 @@ 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,6 +12,7 @@ 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";
 
@@ -19,8 +20,8 @@ const app = createApp(App)
 const pinia = createPinia()
 
 app.use(pinia)
-const ingameStore = useIngame();
+const ui = useIngame();
-initWebSocket(ingameStore)
+initWebSocket(ui);
 app.use(router)
 app.use(Quasar, {
   plugins: {

src/router/index.ts

@@ -7,15 +7,14 @@ import defaultMenu from "../components/DefaultMenu.vue"
 import axios from "axios";
 import { useUserInfo } from "@/composables/useUserInfo";
 import rulesView from "../components/Rules.vue";
-import LobbyView from "@/views/LobbyView.vue";
+import Game from "@/views/Game.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: '/mainmenu/',
+      path: '/',
       component: MainMenuView,
       meta: { requiresAuth: true },
       children: [
@@ -52,9 +51,9 @@ const router = createRouter({
       meta: { requiresAuth: false }
     },
     {
-      path: '/lobby',
+      path: '/game',
-      name: 'lobby',
+      name: 'game',
-      component: LobbyView,
+      component: Game,
       meta: {requiresAuth: true }
     }
   ],

src/runtimeConfig.ts

@@ -2,13 +2,18 @@
 // Reads runtime configuration injected into window.__RUNTIME_CONFIG__ (created by env.js at container start)
 
 declare global {
-  interface Window { __RUNTIME_CONFIG__?: { API_URL?: string } }
+  interface Window { __RUNTIME_CONFIG__?: { API_URL?: string; WEBSOCKET_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,7 +1,8 @@
 import {useIngame} from "@/composables/useIngame.ts";
 import type {GameInfo, LobbyInfo, TieInfo, TrumpInfo, WonInfo} from "@/types/GameTypes.ts";
+import router from "@/router";
 
-const api = window.__RUNTIME_CONFIG__?.API_URL;
+const api = "localhost:9000"
 
 // ---------- Types ---------------------------------------------------------
 
@@ -107,7 +108,9 @@ 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);
       }
     }
@@ -164,7 +167,7 @@ function setupSocketHandlers(socket: WebSocket) {
     }
 
     // You redirect here — if you don’t want auto reconnect, keep as is.
-    location.href = "/mainmenu";
+    router.replace("/");
   };
 }
 

src/types/GameSubTypes.ts

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

src/views/CreateGame.vue

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

src/views/Game.vue

@@ -1,26 +1,40 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 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()
+
-if (ui.gameId) {
+ui.requestState().then(() => {
-  ig.requestGame(ui.gameId)
+  if (ui.gameId == null) {
-  wb.connect()
+    $q.notify({
-} else {
+      message: "You're not in any game!",
-  router.replace("/")
+      color: "negative"
-}
+
+    })
+    router.replace("/")
+  } else {
+    ig.requestGame(ui.gameId).then(() => {
+      wb.connect()
+    })
+  }
+})
 </script>
 
 <template>
   <div class="lobby-background">
-    <Ingame v-if="ig.state === 'InGame'" />
+    <Ingame v-if="state === 'InGame'"/>
+    <lobby-component v-if="state === 'Lobby'"/>
   </div>
 </template>
 
@@ -28,6 +42,6 @@ if (ui.gameId) {
 .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.push("/lobby")
+    router.replace("/game")
   }).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("/mainmenu")
+    router.push("/")
   }).catch(() => {
     loginError.value = 'Invalid username or password'
   }).finally(() =>

src/views/MainMenuView.vue

@@ -14,10 +14,26 @@ import UserStatusArea from '../components/User.vue'
     </q-header>
 
     <q-page-container>
-      <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">
+      <q-page class="flex justify-start items-center column q-pa-md">
-        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=12
+MINOR=14
 PATCH=0