ci: bump version to v0.25.0

feat(ui): FRO-26: Tie Component (#30 )
Added a nice tie component Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #30
2026-01-22 00:15:13 +00:00 · 2026-01-22 01:12:08 +01:00 · 2026-01-20 18:31:14 +00:00 · 2026-01-20 19:28:50 +01:00 · 2026-01-20 11:31:51 +00:00 · 2026-01-20 12:28:20 +01:00
105 changed files with 7877 additions and 287 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ coverage

 # Vitest
 __screenshots__/
+/dev-dist/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,3 +78,101 @@
 ### Features

 * **api:** FRO-14 Create Game ([#14](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/14)) ([df61db2](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/df61db2730b5e6b2796cbe58d1d224f1d5d6f085))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.7.0...0.0.0) (2025-12-10)
+
+### Features
+
+* FRO-23 Create Player Hand Component ([#15](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/15)) ([b20ec0a](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/b20ec0a3638649155f2f9c5984014d75eb2ba618))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.8.0...0.0.0) (2025-12-10)
+
+### Features
+
+* **api:** FRO-15 Join Game ([#16](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/16)) ([14e001c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/14e001cae67592c5ea15786905aa3574df9a9e6c))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.9.0...0.0.0) (2025-12-10)
+
+### Features
+
+* FRO-24 Create Played Cards Component ([#17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/17)) ([21db939](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/21db939d342c72f5ad5fad3b4f873e902d1e5a0f))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.10.0...0.0.0) (2025-12-10)
+
+### 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))
+## [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)
+## [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))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.14.0...0.0.0) (2026-01-06)
+
+### Features
+
+* Enhance win effects and animations in OfflineView component ([db5c70d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/db5c70d02a646b83ba6e4043e28fc0dc9f76fb04))
+* Enhance win effects and animations in OfflineView component ([8aa0738](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/8aa07388ac27fbb13270fde58b1594688ec44fe7))
+* Enhance win effects and animations in OfflineView component ([6b3eaf2](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/6b3eaf2c706b2ea479aa7ba508b05adb4bab2db4))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.15.0...0.0.0) (2026-01-06)
+
+### Features
+
+* Update Dockerfile for multi-platform support and add nginx configuration ([e972f1c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/e972f1c4321ec2633e2989dbdaa714774632c495))
+* Update Dockerfile for multi-platform support and add nginx configuration ([37b88a1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/37b88a108c71e20fc2caee950acd23cf2bb81190))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.16.0...0.0.0) (2026-01-06)
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.16.1...0.0.0) (2026-01-07)
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.16.2...0.0.0) (2026-01-07)
+
+### Features
+
+* Add caching headers for env.js in Nginx configuration ([93e5af7](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/93e5af7402edb9fb9662e37d9b2b8c48d250c36e))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.17.0...0.0.0) (2026-01-07)
+
+### Features
+
+* Add caching headers for env.js in Nginx configuration ([d8b3904](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/d8b3904cbc8b08ed9522d7b9b4fa8af79bc75def))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.18.0...0.0.0) (2026-01-07)
+
+### Features
+
+* Update joinGame endpoint to accept gameId as a path parameter ([92a7bc0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/92a7bc05866b77053ebb1d074ad207be8348f9d6))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.19.0...0.0.0) (2026-01-07)
+
+### Features
+
+* Enhance user state management with polling and WebSocket connection handling ([02869ff](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/02869fff8b448cde73369679c9b38bc99fb771ff))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.20.0...0.0.0) (2026-01-07)
+
+### Features
+
+* Implement PlayDogCard functionality in user session and update Vue component ([058d232](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/058d232d2ba00f33b1e658fc8a793dcd59018fa4))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.21.0...0.0.0) (2026-01-07)
+
+### Features
+
+* Update LobbyComponent to use icons for player removal buttons ([c653746](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/c6537467f87d60aeece18f86f42c839d5437c18b))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.22.0...0.0.0) (2026-01-13)
+
+### Features
+
+* **ui:** Tie selection ([#26](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/26)) ([6c914b1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/6c914b1421030897d47449087dd1694068e84436))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.23.0...0.0.0) (2026-01-20)
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.23.1...0.0.0) (2026-01-20)
+
+### Features
+
+* Update docker-entrypoint.sh and vite.config.ts for improved runtime handling and API navigation ([cd950e9](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/cd950e952117cebe0ec46a18fc5b2cf90b247766))
+## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.24.0...0.0.0) (2026-01-22)
+
+### Features
+
+* **ui:** FRO-26: Tie Component ([#30](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/30)) ([9823af2](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/9823af2a1cee6cc4063f6f55a8ab64ec63525e84))
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-FROM node:lts-alpine3.23 AS builder
+FROM --platform=$BUILDPLATFORM node:lts-alpine3.23 AS builder

 WORKDIR /app

@@ -9,13 +9,15 @@ RUN npm install
 COPY . .
 RUN npm run build

-FROM nginx:stable-alpine AS production
+FROM --platform=$TARGETPLATFORM nginx:stable-alpine AS production

 RUN apk add --no-cache gettext

 RUN rm -rf /usr/share/nginx/html/*
 COPY --from=builder /app/dist /usr/share/nginx/html

+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
 COPY public/env.template.js /usr/share/nginx/html/env.template.js
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -7,13 +7,13 @@ TARGET_PATH="/usr/share/nginx/html/env.js"

 if [ -f "$TEMPLATE_PATH" ]; then
  echo "Rendering runtime config from $TEMPLATE_PATH"
-  # export all variables for envsubst to access
-  # only substitute variables present in the template
+  echo "Using environment variables:"
+  printenv
+  echo "----"
  envsubst < "$TEMPLATE_PATH" > "$TARGET_PATH"
 else
  echo "No runtime template found at $TEMPLATE_PATH, skipping"
 fi

-# Start nginx in foreground
 exec nginx -g 'daemon off;'

--- a/env.d.ts
+++ b/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 {};
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>Knockout-Whist</title>
  </head>
  <body>
    <div id="app"></div>
--- a/nginx.conf
+++ b/nginx.conf
@@ -0,0 +1,22 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /env.js {
+        root /usr/share/nginx/html;
+        default_type application/javascript;
+        expires -1;
+        add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -2,34 +2,32 @@
  "name": "knockoutwhistfrontend",
  "version": "0.0.0",
  "private": true,
-  "type": "module",
-  "engines": {
-    "node": "^20.19.0 || >=22.12.0"
-  },
  "scripts": {
-    "dev": "vite",
    "build": "run-p type-check \"build-only {@}\" --",
-    "preview": "vite preview",
-    "build-only": "vite build",
-    "type-check": "vue-tsc --build",
    "lint": "eslint . --fix --cache",
-    "format": "prettier --write --experimental-cli src/"
+    "build-only": "vite build",
+    "dev": "vite",
+    "format": "prettier --write --experimental-cli src/",
+    "preview": "vite preview",
+    "type-check": "vue-tsc --build"
  },
  "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",
+    "register-service-worker": "^1.7.2",
+    "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",
    "@tsconfig/node24": "^24.0.3",
-    "@types/node": "^24.10.1",
+    "@types/node": "^25.0.3",
    "@vitejs/plugin-vue": "^6.0.2",
    "@vitejs/plugin-vue-jsx": "^5.1.2",
    "@vue/eslint-config-prettier": "^10.2.0",
@@ -43,7 +41,12 @@
    "sass-embedded": "^1.93.3",
    "typescript": "~5.9.0",
    "vite": "^7.2.4",
+    "vite-plugin-pwa": "^1.2.0",
    "vite-plugin-vue-devtools": "^8.0.5",
    "vue-tsc": "^3.1.5"
-  }
+  },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "type": "module"
 }
--- a/public/env.js
+++ b/public/env.js
@@ -1,4 +1,5 @@
 window.__RUNTIME_CONFIG__ = {
-  API_URL: "http://localhost:9000"
+  API_URL: "http://localhost:9000",
+  WEBSOCKET_URL: "ws://localhost:9000/websocket"
 };

--- a/public/env.template.js
+++ b/public/env.template.js
@@ -1,4 +1,5 @@
 window.__RUNTIME_CONFIG__ = {
-  API_URL: "${API_URL}"
+  API_URL: "${API_URL}",
+  WEBSOCKET_URL: "${WEBSOCKET_URL}"
 };

--- a/public/images/cards/1B.png
+++ b/public/images/cards/1B.png
--- a/public/images/cards/1J.png
+++ b/public/images/cards/1J.png
--- a/public/images/cards/2B.png
+++ b/public/images/cards/2B.png
--- a/public/images/cards/2C.png
+++ b/public/images/cards/2C.png
--- a/public/images/cards/2D.png
+++ b/public/images/cards/2D.png
--- a/public/images/cards/2H.png
+++ b/public/images/cards/2H.png
--- a/public/images/cards/2J.png
+++ b/public/images/cards/2J.png
--- a/public/images/cards/2S.png
+++ b/public/images/cards/2S.png
--- a/public/images/cards/3C.png
+++ b/public/images/cards/3C.png
--- a/public/images/cards/3D.png
+++ b/public/images/cards/3D.png
--- a/public/images/cards/3H.png
+++ b/public/images/cards/3H.png
--- a/public/images/cards/3S.png
+++ b/public/images/cards/3S.png
--- a/public/images/cards/4C.png
+++ b/public/images/cards/4C.png
--- a/public/images/cards/4D.png
+++ b/public/images/cards/4D.png
--- a/public/images/cards/4H.png
+++ b/public/images/cards/4H.png
--- a/public/images/cards/4S.png
+++ b/public/images/cards/4S.png
--- a/public/images/cards/5C.png
+++ b/public/images/cards/5C.png
--- a/public/images/cards/5D.png
+++ b/public/images/cards/5D.png
--- a/public/images/cards/5H.png
+++ b/public/images/cards/5H.png
--- a/public/images/cards/5S.png
+++ b/public/images/cards/5S.png
--- a/public/images/cards/6C.png
+++ b/public/images/cards/6C.png
--- a/public/images/cards/6D.png
+++ b/public/images/cards/6D.png
--- a/public/images/cards/6H.png
+++ b/public/images/cards/6H.png
--- a/public/images/cards/6S.png
+++ b/public/images/cards/6S.png
--- a/public/images/cards/7C.png
+++ b/public/images/cards/7C.png
--- a/public/images/cards/7D.png
+++ b/public/images/cards/7D.png
--- a/public/images/cards/7H.png
+++ b/public/images/cards/7H.png
--- a/public/images/cards/7S.png
+++ b/public/images/cards/7S.png
--- a/public/images/cards/8C.png
+++ b/public/images/cards/8C.png
--- a/public/images/cards/8D.png
+++ b/public/images/cards/8D.png
--- a/public/images/cards/8H.png
+++ b/public/images/cards/8H.png
--- a/public/images/cards/8S.png
+++ b/public/images/cards/8S.png
--- a/public/images/cards/9C.png
+++ b/public/images/cards/9C.png
--- a/public/images/cards/9D.png
+++ b/public/images/cards/9D.png
--- a/public/images/cards/9H.png
+++ b/public/images/cards/9H.png
--- a/public/images/cards/9S.png
+++ b/public/images/cards/9S.png
--- a/public/images/cards/AC.png
+++ b/public/images/cards/AC.png
--- a/public/images/cards/ACB.png
+++ b/public/images/cards/ACB.png
--- a/public/images/cards/AD.png
+++ b/public/images/cards/AD.png
--- a/public/images/cards/ADB.png
+++ b/public/images/cards/ADB.png
--- a/public/images/cards/AH.png
+++ b/public/images/cards/AH.png
--- a/public/images/cards/AHB.png
+++ b/public/images/cards/AHB.png
--- a/public/images/cards/AS.png
+++ b/public/images/cards/AS.png
--- a/public/images/cards/ASB.png
+++ b/public/images/cards/ASB.png
--- a/public/images/cards/JC.png
+++ b/public/images/cards/JC.png
--- a/public/images/cards/JD.png
+++ b/public/images/cards/JD.png
--- a/public/images/cards/JH.png
+++ b/public/images/cards/JH.png
--- a/public/images/cards/JS.png
+++ b/public/images/cards/JS.png
--- a/public/images/cards/KC.png
+++ b/public/images/cards/KC.png
--- a/public/images/cards/KD.png
+++ b/public/images/cards/KD.png
--- a/public/images/cards/KH.png
+++ b/public/images/cards/KH.png
--- a/public/images/cards/KS.png
+++ b/public/images/cards/KS.png
--- a/public/images/cards/QC.png
+++ b/public/images/cards/QC.png
--- a/public/images/cards/QD.png
+++ b/public/images/cards/QD.png
--- a/public/images/cards/QH.png
+++ b/public/images/cards/QH.png
--- a/public/images/cards/QS.png
+++ b/public/images/cards/QS.png
--- a/public/images/cards/TC.png
+++ b/public/images/cards/TC.png
--- a/public/images/cards/TD.png
+++ b/public/images/cards/TD.png
--- a/public/images/cards/TH.png
+++ b/public/images/cards/TH.png
--- a/public/images/cards/TS.png
+++ b/public/images/cards/TS.png
--- a/public/logo192.png
+++ b/public/logo192.png
--- a/public/logo512.png
+++ b/public/logo512.png
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,61 @@
 <script setup lang="ts">
 import { RouterView } from 'vue-router'
+import { onMounted, onUnmounted, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useUserInfo } from "@/composables/useUserInfo";
+import {Dark } from "quasar";
+
+const route = useRoute();
+const router = useRouter();
+const info = useUserInfo();
+
+const handleOnlineStatusChange = () => {
+  if (navigator.onLine) {
+    if (route.name === 'offline') {
+      window.location.reload();
+    }
+  }
+};
+
+let interval: number | null = null;
+
+onMounted(async () => {
+  window.addEventListener('online', handleOnlineStatusChange);
+
+  // Initialize dark mode based on browser preference
+  Dark.set('auto');
+
+  // Immediately check user state on app load
+  if (navigator.onLine) {
+    await info.requestState();
+    if (!info.username && route.meta.requiresAuth) {
+      router.push({ name: '/' });
+    }
+  }
+
+  // Continuously check user state every 10 seconds
+  interval = window.setInterval(async () => {
+    if (navigator.onLine) {
+      await info.requestState();
+      if (!info.username && route.meta.requiresAuth) {
+        router.push({ name: '/' });
+      }
+    }
+  }, 10000);
+});
+
+onUnmounted(() => {
+  window.removeEventListener('online', handleOnlineStatusChange);
+  if (interval) {
+    clearInterval(interval);
+  }
+});
+
+watch(() => info.gameId, (newGameId) => {
+  if (newGameId && route.name !== 'game') {
+    router.push({ name: 'game' });
+  }
+});
 </script>

 <template>
--- a/src/components/Ingame.vue
+++ b/src/components/Ingame.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+
+import {useIngame} from "@/composables/useIngame.ts";
+import type {GameInfo, TrumpInfo} 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";
+import TrumpC from "@/components/ingame/TrumpC.vue";
+import {storeToRefs} from "pinia";
+import {ref, toRefs, watch} from "vue";
+import TieC from "@/components/ingame/TieC.vue";
+
+const ig = useIngame()
+const { state } = toRefs(ig)
+
+const cachedGameInfo = ref<GameInfo | null>(null)
+
+watch(
+  () => ig.data,
+  (newData) => {
+    if (state.value === 'InGame' && newData) {
+      cachedGameInfo.value = newData as GameInfo
+    }
+  },
+  { deep: true, immediate: true }
+)
+</script>
+
+<template>
+  <q-layout>
+    <q-page-container>
+      <q-page class="game-field-background vh-100 ingame-side-shadow">
+        <div class="py-5 container-xxl">
+          <transition
+            appear
+            enter-active-class="animate__animated animate__fadeInDown"
+            leave-active-class="animate__animated animate__fadeOutDown"
+          >
+            <div
+              v-if="state === 'SelectTrump'"
+              class="full-overlay-blur"
+              style="z-index: 2000;"
+            >
+              <TrumpC />
+            </div>
+          </transition>
+
+
+          <transition
+            appear
+            enter-active-class="animate__animated animate__fadeInDown"
+            leave-active-class="animate__animated animate__fadeOutDown"
+          >
+            <div
+              v-if="state === 'TieBreak'"
+              class="full-overlay-blur"
+              style="z-index: 2000;"
+            >
+              <TieC />
+            </div>
+          </transition>
+
+          <div class="fit row wrap justify-center items-center content-start">
+            <div class="mt-5 ml-4 self-start col-2">
+              <TurnC v-if="(cachedGameInfo as GameInfo)?.playerQueue" :queue="(cachedGameInfo as GameInfo).playerQueue!"/>
+            </div>
+
+            <div class="text-center col-6">
+              <ScoreboardC v-if="(cachedGameInfo as GameInfo)?.currentRound" :current-round="(cachedGameInfo as GameInfo).currentRound!" />
+            </div>
+
+
+            <div class="mt-5 ml-4 self-end col-2" style="margin-left: 6em">
+              <GameInfoC v-if="(cachedGameInfo as GameInfo)?.currentRound"
+                         :first-card="(cachedGameInfo as GameInfo).currentTrick?.firstCard ?? null"
+                         :trumpsuit="(cachedGameInfo as GameInfo).currentRound!.trumpSuit"/>
+            </div>
+          </div>
+
+          <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="(cachedGameInfo as GameInfo)?.currentTrick" :trick="(cachedGameInfo 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="(cachedGameInfo as GameInfo)?.hand && (cachedGameInfo as GameInfo)?.self"/>
+            </div>
+          </div>
+
+        </div>
+      </q-page>
+    </q-page-container>
+  </q-layout>
+</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
+}
+.bottom-div {
+  position: fixed;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  max-width: 1400px;
+  width: 100%;
+  margin: 0;
+  text-align: center;
+  padding: 10px;
+}
+.full-overlay-blur {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  backdrop-filter: blur(5px);
+  background-color: rgba(0, 0, 0, 0.2);
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
--- a/src/components/MainMenuBoxes.vue
+++ b/src/components/MainMenuBoxes.vue
@@ -1,55 +1,91 @@
 <script setup lang="ts">
 import { useRouter } from 'vue-router';
+import { useUserInfo } from '@/composables/useUserInfo';
+import { useQuasar } from 'quasar';

 const router = useRouter();
+const userInfo = useUserInfo();
+const $q = useQuasar();
+
 const menuItems = [
  {
    title: 'Create game',
    description: 'Create a new game and invite your friends to play with you.',
    icon: 'add_circle_outline',
    routeName: 'create-Game',
-    color: 'green-9'
+    color: 'green-9',
+    requiresAuth: true
  },
  {
    title: 'Spiel beitreten',
    description: 'Join a game by typing in the game identifier.',
    icon: 'login',
    routeName: 'join-Game',
-    color: 'blue-9'
+    color: 'blue-9',
+    requiresAuth: true
  },
  {
    title: 'Settings',
    description: 'This area is currently under construction.',
    icon: 'settings',
    routeName: 'settings',
-    color: 'grey-8'
+    color: 'grey-8',
+    requiresAuth: false
  },
  {
    title: 'Rules',
    description: 'Look at the rules to have a clear understanding for playing the game.',
    icon: 'settings',
-    routeName: 'rules-Game',
-    color: 'grey-8'
+    routeName: 'rule-Game',
+    color: 'grey-8',
+    requiresAuth: false
  }
 ];

-const navigateTo = (routeName: string) => {
-  router.push({ name: routeName });
+const navigateTo = (item: any) => {
+  if (item.requiresAuth && !userInfo.username) {
+    $q.dialog({
+      title: 'Authentication Required',
+      message: 'You need to be logged in to create or join a game. Would you like to log in or sign up?',
+      ok: {
+        label: 'Login',
+        color: 'primary'
+      },
+      cancel: {
+        label: 'Sign Up',
+        color: 'secondary'
+      }
+    }).onOk(() => {
+      router.push({ name: 'login' });
+    }).onCancel(() => {
+      router.push({ name: 'register' });
+    });
+  } else {
+    router.push({ name: item.routeName });
+  }
 };
 </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"
        v-ripple
-        @click="navigateTo(item.routeName)"
+        @click="navigateTo(item)"
      >
        <q-card-section class="row items-center no-wrap">
          <q-avatar
@@ -68,7 +104,7 @@ const navigateTo = (routeName: string) => {
        </q-card-section>
      </q-card>
    </div>
-  </div>
+  </transition-group>
 </template>

 <style scoped>
@@ -77,7 +113,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;
--- a/src/components/User.vue
+++ b/src/components/User.vue
@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import { useUserInfo } from "@/composables/useUserInfo.ts";
+import { useRouter } from 'vue-router';
+import {useQuasar} from "quasar";
+import axios from "axios";
+
+const api = window?.__RUNTIME_CONFIG__?.API_URL;
+const $q = useQuasar()
+let userinfo = useUserInfo();
+const router = useRouter();
+
+const handleLogoff = () => {
+
+  axios.post(`${api}/logout`, {}, {withCredentials: true}).then((response) => {
+    const responseData = response.data
+    console.log("Response" + responseData.status)
+    $q.notify({
+      message: `You successfully logged out!`,
+      color: 'green-6',
+      icon: 'check_circle',
+      position: 'top'
+    });
+    router.push({ name: 'login' });
+  }).catch((err) => {
+    console.log("ERROR:" + err)
+    $q.notify({
+      message: `Something went wrong`,
+      color: 'red-6',
+      icon: 'cancel',
+      position: 'top'
+    });
+  })
+
+}
+</script>
+
+<template>
+  <div class="row items-center q-gutter-x-md">
+
+    <div
+      v-if="userinfo.username"
+      class="text-body1 text-weight-medium row items-center q-gutter-x-sm cursor-pointer relative-position"
+    >
+      <div id="user-menu-target" class="row items-center q-gutter-x-sm" style="min-width: 150px">
+        <q-icon name="account_circle" size="md" />
+        <span>{{ userinfo.username }}</span>
+        <q-icon name="arrow_drop_down" size="sm" />
+      </div>
+
+      <q-menu
+        target="#user-menu-target"
+        anchor="bottom right"
+        self="top right"
+      >
+        <q-list style="max-width: 150px" class="bg-dark">
+          <q-item
+            clickable
+            v-close-popup
+            @click="handleLogoff"
+            class="text-negative"
+          >
+            <q-item-section avatar>
+              <q-icon name="logout" color="negative" />
+            </q-item-section>
+            <q-item-section>Log Off</q-item-section>
+          </q-item>
+        </q-list>
+      </q-menu>
+    </div>
+
+    <div v-else class="row items-center q-gutter-x-sm">
+      <q-btn
+        flat
+        color="white"
+        label="Login"
+        @click="router.push({ name: 'login' })"
+        size="sm"
+      />
+      <q-btn
+        outline
+        color="white"
+        label="Sign Up"
+        @click="router.push({ name: 'register' })"
+        size="sm"
+      />
+    </div>
+
+  </div>
+</template>
+<style scoped>
+#user-menu-target:hover {
+  opacity: 0.8;
+}
+</style>
--- a/src/components/ingame/GameInfoC.vue
+++ b/src/components/ingame/GameInfoC.vue
@@ -0,0 +1,55 @@
+<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.identifier.charAt(1) as string) {
+    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 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"
+               style="width: 80px; border-radius: 6px;"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.firstbox {
+  width: 80px;
+  border-radius: 6px;
+}
+</style>
--- a/src/components/ingame/HandC.vue
+++ b/src/components/ingame/HandC.vue
@@ -0,0 +1,170 @@
+<script lang="ts" setup>
+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)
+let wiggleTimer: ReturnType<typeof setTimeout> | null = null
+
+function triggerWiggle(index: number) {
+  // 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) {
+  if (index === null) return
+
+  wb.sendAndWait((<GameInfo>wi.data)?.self?.dogLife ? "PlayDogCard" : "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() {
+  wb.sendAndWait("PlayDogCard", { cardindex: 'Skip' }).catch((error) => {
+    $q.notify({
+      message: error.message,
+      color: "negative",
+      position: "top"
+    })
+  })
+}
+
+function getCardImagePath(cardPath: string) {
+  if (!cardPath) return ''
+  if (cardPath.includes('://') || cardPath.startsWith('/')) return cardPath
+  return `/${cardPath}`
+}
+</script>
+
+<template>
+  <div class="hand-container">
+    <div id="card-slide" class="ingame-cards-slide">
+      <transition-group
+        tag="div"
+        class="cards-row"
+        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>
+      </transition-group>
+      <div v-if="(<GameInfo>wi.data)?.self?.dogLife" class="dog-actions">
+        <q-btn color="negative" label="Skip Turn" @click="handleSkipDogLife" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.bottom-div {
+  position: fixed;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  max-width: 1400px;
+  width: 100%;
+  margin: 0;
+  text-align: center;
+  padding: 10px;
+}
+.hand-container {
+  margin-left: 0;
+  margin-right: 0;
+}
+.ingame-cards-slide {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+}
+.cards-row {
+  display: flex;
+  flex-wrap: nowrap;
+  gap: 8px;
+  align-items: flex-end;
+  justify-content: center;
+}
+.handcard {
+  border-radius: 6px;
+}
+.card-btn {
+  padding: 0;
+  min-width: 0;
+  border-radius: 6px;
+}
+.inactive {
+  opacity: 0.6;
+  pointer-events: none;
+}
+.dog-actions {
+  margin-top: 8px;
+}
+.handcard :hover {
+  box-shadow: 3px 3px 3px #000000;
+}
+.card {
+  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 {
+    width: 80px;
+    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>
--- a/src/components/ingame/PlayedCardsC.vue
+++ b/src/components/ingame/PlayedCardsC.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup>
+import {computed, defineProps, toRefs} from 'vue'
+import type {Trick} from "@/types/GameSubTypes.ts";
+const props = defineProps<{ trick: Trick }>()
+
+const {trick } = toRefs(props)
+
+const playedCards = computed(() => {
+  if (!trick.value) return []
+  let result: { cardId: string, player: string }[] = []
+  for (const key in trick.value.cards) {
+    result.push({
+      cardId: trick.value.cards[key]?.path ?? '',
+      player: key
+    })
+  }
+  return result;
+})
+
+function getCardImagePath(cardPath: string) {
+  if (!cardPath) return ''
+  if (cardPath.includes('://') || cardPath.startsWith('/')) return cardPath
+  return `/${cardPath}`
+}
+</script>
+
+<template>
+  <div class="row items-center justify-center q-gutter-sm" id="trick-cards-content">
+    <div v-for="(play, index) in playedCards" :key="index" class="col-auto">
+      <q-card flat class="bg-transparent trick-card" style="width: 7rem; backdrop-filter: blur(4px);">
+        <q-card-section class="q-pa-sm q-pb-xs">
+          <q-img :src="getCardImagePath(play.cardId)" alt="card" style="border-radius: 6px; width:100%" />
+        </q-card-section>
+        <q-card-section class="q-pa-sm q-pt-xs text-center bg-transparent">
+          <div class="text-subtitle2 text-grey-7">{{ play.player }}</div>
+        </q-card-section>
+      </q-card>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.trick-card {
+  box-shadow: 0 1px 6px rgba(0,0,0,0.08);
+}
+</style>
--- a/src/components/ingame/ScoreboardC.vue
+++ b/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 props.currentRound.playersIn.map(player => {
    return {
      name: player.name,
      tricks: props.currentRound.trickList.filter(trick => {
        return trick.winner?.id === player.id
      }).length
    }
+  })
 })
 </script>

--- a/src/components/ingame/TieC.vue
+++ b/src/components/ingame/TieC.vue
@@ -0,0 +1,485 @@
+<script setup lang="ts">
+import {useWebSocket} from "@/composables/useWebsocket.ts";
+import {useIngame} from "@/composables/useIngame.ts";
+import type {GameInfo, LobbyInfo, TieInfo, TrumpInfo} from "@/types/GameTypes.ts";
+import {useQuasar} from "quasar";
+import { ref } from 'vue';
+import { computed, nextTick } from 'vue'
+
+const wb = useWebSocket()
+const wi = useIngame()
+const tieInf = computed(() => wi.data as TieInfo)
+const tieBlankCard = "/images/cards/1B.png"
+const $q = useQuasar();
+function getCardImagePath(cardPath: string) {
+  if (!cardPath) return ''
+  if (cardPath.includes('://') || cardPath.startsWith('/')) return cardPath
+  return `/${cardPath}`
+}
+
+function getPlayerName(playerId: string) {
+  return tieInf.value.tiedPlayers.find(p => p.id === playerId)?.name || 'Player';
+}
+const myRevealedCard = computed(() => {
+  const myId = tieInf.value.self?.id;
+
+  if (!myId || !tieInf.value.selectedCards) return null;
+
+  const card = tieInf.value.selectedCards[myId];
+
+  return card ? getCardImagePath(card.path) : null;
+});
+
+const isFlipping = ref(false);
+const showPickScreen = computed(() => {
+  const isMyTurn = tieInf.value.self?.id === tieInf.value.currentPlayer?.id;
+  return isFlipping.value || (isMyTurn && !showResultScreen.value);
+});
+
+const showResultScreen = computed(() => {
+  const allPicked = Object.keys(tieInf.value.selectedCards).length === tieInf.value.tiedPlayers.length;
+  return allPicked && !isFlipping.value;
+});
+
+
+function selectTie(tieIndex: number) {
+  isFlipping.value = true;
+  nextTick(() => {
+    wb.sendAndWait("PickTie", { cardIndex: tieIndex })
+      .then(() => {
+        console.log("Server accepted pick, starting animation...");
+        console.log("CARD SELECTED: " + Object.keys(tieInf.value.selectedCards).length)
+
+
+        $q.notify({
+          message: "Card revealed!",
+          color: "positive",
+          position: "top",
+          timeout: 1000
+        });
+
+        setTimeout(() => {
+          isFlipping.value = false;
+          model.value = null;
+        }, 2500);
+      })
+      .catch((error) => {
+        isFlipping.value = false;
+        console.error("Pick failed:", error);
+        $q.notify({
+          message: error.message || "Failed to pick card",
+          color: "negative",
+          position: "top"
+        });
+      });
+  });
+
+}
+const model = ref<number | null>(null)
+const options = computed(() => {
+  const list = []
+  const max = tieInf.value.highestAmount?.valueOf() || 0
+  for (let i = 1; i <= max; i++) {
+    list.push(i)
+  }
+  return list
+})
+
+</script>
+
+<template>
+  <transition
+    appear
+    enter-active-class="animate__animated animate__fadeInDown"
+    leave-active-class="animate__animated animate__fadeOutDown"
+    mode="out-in"
+  >
+  <q-card v-if="showPickScreen" class="game-container text-center overflow-hidden">
+
+    <div class="bg-glow"></div>
+
+    <q-card-section class="content-layer q-py-xl">
+      <div class="text-overline text-primary letter-spacing-2">Tie-Break Round</div>
+      <div class="text-h4 text-weight-bold text-white q-mb-xl text-uppercase tracking-widest">
+        {{ isFlipping ? 'Your Result' : (model ? `Selection: Card #${model}` : 'Pick Your Card') }}
+      </div>
+
+      <div class="card-fan-container q-mb-xl">
+        <div
+          v-for="n in options"
+          :key="n"
+          @click="!isFlipping && (model = n)"
+          v-show="model === null || model === n"
+          class="tie-card-wrapper"
+          :class="{ 'selected-card': model === n, 'is-flipping': isFlipping && model === n }"
+        >
+          <div class="card-inner">
+            <q-img
+              :src="(model === n && myRevealedCard) ? myRevealedCard : getCardImagePath(tieBlankCard)"
+              class="card-image shadow-24"
+              :class="{ 'animate-reveal': isFlipping && model === n }"
+            />
+
+            <div v-if="!isFlipping" class="card-number">
+              {{ n }}
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="action-area" :class="{ 'visible': model !== null && !isFlipping }">
+        <div class="row q-gutter-md justify-center items-center">
+          <q-btn flat color="grey-4" label="Cancel" @click="model = null" />
+          <q-btn
+            label="Confirm Selection"
+            color="positive"
+            unelevated
+            @click="selectTie(model!)"
+            class="confirm-btn"
+          />
+        </div>
+      </div>
+
+      <div v-if="!model && !isFlipping" class="text-grey-6 text-italic q-mt-md">
+        Hover and click to select a card from the deck
+      </div>
+    </q-card-section>
+  </q-card>
+
+  <q-card v-else-if="!showResultScreen" class="game-container text-center overflow-hidden">
+    <q-card-section class="content-layer q-py-xl">
+      <div class="text-overline text-primary letter-spacing-2">Tie-Break Round</div>
+
+      <div class="column items-center">
+
+        <div class="revealed-row q-mb-lg">
+          <div
+            v-for="(card, playerId) in tieInf.selectedCards"
+            :key="playerId"
+            class="revealed-card-wrapper"
+          >
+            <div class="text-caption text-grey-5 q-mb-xs">{{ getPlayerName(playerId) }}</div>
+            <q-img :src="getCardImagePath(card.path)" class="card-image shadow-24" />
+          </div>
+        </div>
+
+        <div class="card-fan-container skeleton-fan">
+          <q-skeleton
+            v-for="n in options"
+            :key="n"
+            type="rect"
+            class="skeleton-card"
+          />
+        </div>
+
+        <div class="q-mt-xl">
+          <q-spinner-hourglass color="white" size="4em" />
+          <div class="text-subtitle1 text-grey-5 q-mt-sm italic">
+            Waiting for <span class="text-white">{{ tieInf.currentPlayer?.name }}</span> to pick a card...
+          </div>
+        </div>
+      </div>
+    </q-card-section>
+
+  </q-card>
+    <q-card v-else class="game-container tie-break-card text-center overflow-hidden">
+      <div class="absolute-full bg-gradient-dark opacity-80"></div>
+
+      <q-card-section class="content-layer q-py-xl">
+        <div class="column items-center q-mb-xl">
+          <q-icon
+            :name="(tieInf.winners?.length || 0) > 1 ? 'auto_renew' : 'workspace_premium'"
+            :color="(tieInf.winners?.length || 0) > 1 ? 'info' : 'warning'"
+            size="64px"
+            class="q-mb-sm"
+          />
+          <div class="text-h3 text-weight-bolder text-white text-uppercase tracking-widest">
+            {{ (tieInf.winners?.length || 0) > 1 ? 'Another Tie!' : 'Tie Broken' }}
+          </div>
+          <p class="text-subtitle1 text-grey-4">
+            {{ (tieInf.winners?.length || 0) > 1 ? 'The high cards matched. Draw again!' : 'We have a winner.' }}
+          </p>
+        </div>
+
+        <div class="row justify-center items-end q-gutter-lg">
+          <div
+            v-for="(card, playerId) in tieInf.selectedCards"
+            :key="playerId"
+            class="revealed-card-wrapper"
+            :class="{
+          'winner-glow': tieInf.winners?.map(player => player.id).includes(playerId),
+          'opacity-40': !tieInf.winners?.map(player => player.id).includes(playerId) && (tieInf.winners?.length || 0) > 0
+        }"
+          >
+            <div class="player-tag q-mb-md">
+              <div class="text-overline text-white">{{ getPlayerName(playerId) }}</div>
+              <q-badge
+                v-if="tieInf.winners?.map(player => player.id).includes(playerId)"
+                :color="tieInf.winners.length > 1 ? 'info' : 'positive'"
+                :label="tieInf.winners.length > 1 ? 'Still Tied' : 'Winner'"
+                rounded
+              />
+            </div>
+
+            <div class="card-stack">
+              <q-img
+                :src="getCardImagePath(card.path)"
+                class="card-image-reveal shadow-24"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="column items-center q-mt-lg">
+          <q-spinner-hourglass color="white" size="4em" />
+          <div class="text-subtitle1 text-white q-mt-sm italic">
+            Preparing trumpsuit selection...
+          </div>
+        </div>
+      </q-card-section>
+    </q-card>
+  </transition>
+</template>
+
+<style scoped>
+.game-container {
+  max-width: 1400px;
+  width: 95vw;
+  margin: 0 auto;
+  background: #0f0f0f;
+  border: 1px solid rgba(255,255,255,0.1);
+  border-radius: 20px;
+  position: relative;
+}
+
+.bg-glow {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 600px;
+  height: 400px;
+  background: radial-gradient(circle, rgba(25, 118, 210, 0.15) 0%, rgba(0,0,0,0) 70%);
+  transform: translate(-50%, -50%);
+  pointer-events: none;
+}
+
+.card-fan-container {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-items: center;
+  padding: 60px 20px;
+  min-height: 300px;
+  perspective: 1000px;
+  gap: 40px 0;
+}
+
+.tie-card-wrapper {
+  position: relative;
+  transition: all 0.4s cubic-bezier(0.34, 1.56, 0.64, 1);
+  margin-left: -35px;
+  z-index: 1;
+}
+
+.tie-card-wrapper:first-child { margin-left: 0; }
+
+.card-image {
+  width: 60px;
+  border-radius: 10px;
+  border: 1px solid rgba(255,255,255,0.1);
+}
+
+.tie-card-wrapper:hover {
+  transform: translateY(-40px) scale(1.1) rotate(2deg);
+  z-index: 50 !important;
+}
+
+.selected-card {
+  margin-left: 0 !important;
+  transform: scale(1.4) !important;
+  z-index: 100;
+}
+
+.selected-card .card-image {
+  border: 3px solid #1976d2;
+  box-shadow: 0 0 30px rgba(25, 118, 210, 0.5);
+}
+
+.card-number {
+  position: absolute;
+  bottom: -30px;
+  left: 50%;
+  transform: translateX(-50%);
+  font-weight: 900;
+  font-size: 1.1rem;
+  color: #fff;
+}
+
+.confirm-btn {
+  padding: 12px 40px;
+  border-radius: 50px;
+  font-weight: bold;
+  letter-spacing: 1px;
+}
+
+.letter-spacing-2 { letter-spacing: 2px; }
+
+
+/* Hide action area when no model is selected */
+.action-area {
+  opacity: 0;
+  transform: translateY(20px);
+  transition: all 0.3s ease;
+}
+.action-area.visible {
+  opacity: 1;
+  transform: translateY(0);
+}
+.bg-glow.dimmed {
+  background: radial-gradient(circle, rgba(150, 150, 150, 0.05) 0%, rgba(0,0,0,0) 70%);
+}
+.tracking-widest {
+  letter-spacing: 0.2em;
+}
+
+@keyframes pulse {
+  0%, 100% { transform: scale(1); opacity: 0.2; }
+  50% { transform: scale(1.05); opacity: 0.5; }
+}
+.skeleton-fan {
+  opacity: 0.15;
+  perspective: 1000px;
+}
+
+.skeleton-card {
+  width: 60px;
+  height: 90px;
+  background: rgba(255, 255, 255, 0.1) !important;
+  margin-left: -35px; /* Matches your tie-card-wrapper overlap */
+  border-radius: 10px;
+  border: 1px solid rgba(255, 255, 255, 0.05);
+}
+
+.skeleton-card:first-child {
+  margin-left: 0;
+}
+/* Container for the cards that have been "pulled" higher */
+.revealed-row {
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  gap: 20px;
+  min-height: 140px; /* Reserves space so the layout doesn't jump */
+  width: 100%;
+}
+
+.revealed-card-wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  animation: slideDownFade 0.4s ease-out;
+}
+
+/* Specific styling for the revealed card images */
+.revealed-card-wrapper .card-image {
+  width: 65px;
+  border-radius: 8px;
+  border: 2px solid var(--q-primary);
+}
+
+/* Keeping your original skeleton fan look */
+.skeleton-fan {
+  opacity: 0.15;
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
+
+.skeleton-card {
+  width: 60px;
+  height: 90px;
+  background: rgba(255, 255, 255, 0.1) !important;
+  margin-left: -35px;
+  border-radius: 10px;
+}
+
+.skeleton-card:first-child {
+  margin-left: 0;
+}
+
+@keyframes slideDownFade {
+  0% { opacity: 0; transform: translateY(-20px); }
+  100% { opacity: 1; transform: translateY(0); }
+}
+.card-inner {
+  perspective: 1000px;
+}
+
+/* The Reveal Animation */
+.animate-reveal {
+  animation: dramaticFlip 1.2s cubic-bezier(0.4, 0, 0.2, 1) forwards;
+  backface-visibility: hidden;
+  z-index: 1000;
+}
+
+@keyframes dramaticFlip {
+  0% {
+    transform: rotateY(0deg) scale(1);
+  }
+  40% {
+    /* Halfway: Card is vertical and lifted up */
+    transform: rotateY(90deg) scale(1.5) translateY(-30px);
+    filter: brightness(1.3);
+  }
+  100% {
+    /* Final: Card is flat again, showing the face */
+    transform: rotateY(0deg) scale(1.3) translateY(0);
+  }
+}
+
+/* Ensure the image isn't mirrored after the rotation logic */
+.animate-reveal :deep(img) {
+  backface-visibility: hidden;
+}
+
+/* Optional: Slight pulse while the button is waiting to be clicked */
+.selected-card:not(.is-flipping) {
+  animation: pulse 2s infinite;
+}
+
+@keyframes pulse {
+  0% { transform: scale(1.4); }
+  50% { transform: scale(1.45); box-shadow: 0 0 40px rgba(25, 118, 210, 0.6); }
+  100% { transform: scale(1.4); }
+}
+/* Add to previous styles */
+
+.winner-glow .card-image {
+  border-color: #31ccec; /* Default 'info' blue for ongoing ties */
+  transform: scale(1.05) translateY(-10px);
+  box-shadow: 0 10px 40px rgba(49, 204, 236, 0.4) !important;
+}
+
+/* If there is only one winner, change glow to Gold */
+.winner-glow:only-child .card-image,
+.tie-break-card .winner-glow:has(.bg-positive) .card-image {
+  border-color: #f2c037;
+  box-shadow: 0 10px 40px rgba(242, 192, 55, 0.5) !important;
+}
+
+.opacity-40 {
+  opacity: 0.4;
+  filter: grayscale(0.8);
+  transform: scale(0.9);
+  transition: all 0.5s ease;
+}
+
+.card-stack {
+  perspective: 1000px;
+}
+
+.card-image-reveal {
+  width: 130px;
+  border-radius: 10px;
+  transition: all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+}
+</style>
--- a/src/components/ingame/TrumpC.vue
+++ b/src/components/ingame/TrumpC.vue
@@ -0,0 +1,134 @@
+<script setup lang="ts" >
+import {useWebSocket} from "@/composables/useWebsocket.ts";
+import {useIngame} from "@/composables/useIngame.ts";
+import type {GameInfo, TrumpInfo} from "@/types/GameTypes.ts";
+import {useQuasar} from "quasar";
+import { ref } from 'vue';
+
+const wb = useWebSocket()
+const wi = useIngame()
+const trumpInf = wi.data as TrumpInfo
+const trumpSuits = [
+  "/images/cards/AS.png",
+  "/images/cards/AH.png",
+  "/images/cards/AD.png",
+  "/images/cards/AC.png"
+]
+const $q = useQuasar();
+function getCardImagePath(cardPath: string) {
+  if (!cardPath) return ''
+  if (cardPath.includes('://') || cardPath.startsWith('/')) return cardPath
+  return `/${cardPath}`
+}
+function selectTrump(trumpSuitIndex: number) {
+  wb.sendAndWait("PickTrumpsuit", { suitIndex: trumpSuitIndex }).then(
+    $q.notify({
+      message: "You've successfully picked your trumpsuit",
+      color: "positive",
+      position: "top"
+    })
+
+  ).catch((error) => {
+      $q.notify({
+        message: error.message,
+        color: "negative",
+        position: "top"
+      })
+    })
+}
+</script>
+<template>
+    <q-card v-if="trumpInf.chooser?.name === trumpInf.self?.name" class="player-profile-card" flat bordered>
+      <q-card-section class="bg-white text-dark text-center q-py-lg">
+        <div class="text-h3 text-weight-bolder">
+          {{ trumpInf.self?.name || "Loading Player..."}}
+        </div>
+      </q-card-section>
+
+      <q-card-section class="bg-light-green-7 text-dark text-center q-py-lg">
+        <div class="text-h4 text-weight-bolder">
+          <q-icon name="emoji_events" class="q-mr-sm" />
+          You won the last round!
+          <q-icon name="emoji_events" class="q-mr-sm" />
+        </div>
+      </q-card-section>
+
+      <q-card-section class="q-py-md text-center bg-dark">
+        <div class="text-h6 q-mb-sm">Select a trumpsuit</div>
+        <div class="row justify-center q-gutter-sm">
+          <q-card v-for="(path, index) in trumpSuits" :key="index" class="q-pa-xs cursor-pointer trump-card-choice">
+            <q-img
+              :src="getCardImagePath(path)"
+              @click="selectTrump(index)"
+              :alt="path"
+              class="card"
+            />
+          </q-card>
+        </div>
+      </q-card-section>
+
+      <q-separator color="grey-7" style="opacity: 0.9;" />
+
+      <q-card-section class="q-pa-md text-center bg-dark">
+        <div class="text-h6 q-mb-sm">Your Hand ({{ trumpInf.selfHand?.cards.length || 0 }} Cards)</div>
+        <div class="row wrap justify-center q-gutter-sm">
+
+          <div v-for="card in trumpInf.selfHand?.cards || []" :key="card.idx!" >
+            <q-img
+              :src="getCardImagePath(card.path)"
+              :alt="card.identifier"
+              class="card"
+            />
+          </div>
+
+        </div>
+      </q-card-section>
+    </q-card>
+  <q-card
+    v-else
+    class="player-profile-card text-center"
+    flat
+    bordered
+    style="min-height: 200px; display: flex; flex-direction: column; justify-content: center;"
+  >
+    <q-card-section class="q-pa-lg">
+      <q-spinner-hourglass color="black" size="3em" class="q-mb-md" />
+      <div class="text-h5 text-grey-8">
+        Waiting for {{ trumpInf.chooser?.name || 'the other player' }} to select the trump suit...
+      </div>
+    </q-card-section>
+
+    <q-separator />
+    <q-card-section class="q-pa-md text-center bg-dark">
+      <div class="text-h6 text-white q-mb-sm">Your Hand ({{ trumpInf.selfHand?.cards.length || 0 }} Cards)</div>
+      <div class="row wrap justify-center q-gutter-sm">
+
+        <div v-for="card in trumpInf.selfHand?.cards || []" :key="card.idx!" >
+          <q-img
+            :src="getCardImagePath(card.path)"
+            :alt="card.identifier"
+            class="card"
+          />
+        </div>
+
+      </div>
+    </q-card-section>
+
+  </q-card>
+</template>
+
+<style scoped>
+.card {
+  width:120px;
+  border-radius:6px
+}
+.player-profile-card {
+  max-width: 1000px;
+}
+.trump-card-choice {
+  transition: transform 0.3s ease-out, box-shadow 0.3s ease-out;
+}
+.trump-card-choice:hover {
+  transform: translateY(-8px);
+}
+</style>
--- a/src/components/ingame/TurnC.vue
+++ b/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<{
-  queue: PlayerQueue
-}>()
-
-const safeNextPlayers = computed(() => props.queue.players ?? [])
+const ig = useIngame()
+const currentPlayer = computed(() => (<GameInfo>ig.data).playerQueue?.currentPlayer)
+const queue = computed(() => { return (<GameInfo>ig.data).playerQueue?.queue ?? []})
 </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>
--- a/src/components/lobby/LobbyComponent.vue
+++ b/src/components/lobby/LobbyComponent.vue
@@ -0,0 +1,150 @@
+<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 {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 isHost = computed(() => (<LobbyInfo>ig.data).self.host);
+const players = computed(() => {
+  return (<LobbyInfo>ig.data).users;
+})
+const lobbyName = computed(() => {
+  return `${ig.data?.gameId}`
+});
+
+const handleKickPlayer = (user: User) => {
+  if (isHost) {
+    wb.send("KickPlayer", {playerId: user.id})
+  }
+};
+
+const handleStartGame = () => {
+  if (isHost) {
+    wb.sendAndWait("StartGame", {})
+  }
+};
+
+const handleLeaveGame = (user: 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>
+
+<template>
+
+    <div class="row q-pa-md items-center">
+      <div class="col text-center text-h4 text-weight-medium">
+        Lobby Name: {{ lobbyName }} </div>
+      <q-btn
+        color="negative"
+        label="Exit"
+        @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 }} / {{ maxPlayers }}
+      </div>
+    </div>
+
+    <div class="row justify-center items-center flex-grow-1 q-px-md">
+      <div class="col-12">
+        <div class="row justify-center q-gutter-md">
+          <div v-for="player in players" :key="player.id" class="col-auto">
+            <q-card class="bg-dark q-pa-md text-center" style="width: 250px;">
+
+              <q-avatar size="80px" color="primary" text-color="white" :icon="profileIcon" class="q-mb-sm" />
+
+              <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">
+                  (You)
+                </q-badge>
+                  <q-badge v-else-if="player.host" color="blue" align="middle" class="q-ml-xs">
+                    (Host)
+                  </q-badge>
+                </div>
+              </q-card-section>
+
+              <q-card-actions align="center" v-if="isHost">
+                <q-btn
+                  v-if="player.id !== (<LobbyInfo>ig.data).self.id"
+                  color="negative"
+                  icon="sports_martial_arts"
+                  @click="handleKickPlayer(player)"
+                  class="full-width"
+                />
+                <q-btn
+                  v-else
+                  color="negative"
+                  icon="sports_martial_arts"
+                  disable
+                  class="full-width"
+                />
+              </q-card-actions>
+
+            </q-card>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="row q-py-lg text-center">
+      <div class="col-12">
+        <template v-if="isHost">
+          <q-btn
+            color="positive"
+            label="Start Game"
+            size="lg"
+            @click="handleStartGame"
+          />
+        </template>
+        <template v-else>
+          <div class="text-h6 q-mb-sm">
+            Waiting for the host to start the game...
+          </div>
+          <q-spinner
+            color="primary"
+            size="3em"
+            :thickness="2"
+          />
+        </template>
+      </div>
+    </div>
+</template>
+
+<style scoped>
+</style>
--- a/src/composables/useIngame.ts
+++ b/src/composables/useIngame.ts
@@ -0,0 +1,36 @@
+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;
+
+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);
+  const isWsConnected: Ref<boolean> = ref(false);
+
+  function setIngame(newState: 'Lobby' | 'InGame' | 'SelectTrump' | 'TieBreak' | 'FinishedMatch', newData: GameInfo | LobbyInfo | TieInfo | TrumpInfo | WonInfo) {
+    state.value = newState;
+    data.value = newData;
+  }
+
+  function setWsConnected(connected: boolean) {
+    isWsConnected.value = connected;
+  }
+
+  async function requestGame(gameId: string) {
+    await axios.get(`${api}/status/${gameId}`, {withCredentials: true}).then((response) => {
+      setIngame(response.data.state, response.data.data);
+    });
+  }
+
+  function clearIngame() {
+    state.value = null;
+    data.value = null;
+    isWsConnected.value = false;
+  }
+
+  return { state, data, isWsConnected, requestGame, setIngame, clearIngame, setWsConnected };
+});
--- a/src/composables/useUserInfo.ts
+++ b/src/composables/useUserInfo.ts
@@ -1,19 +1,51 @@
 import { defineStore } from 'pinia'
 import {ref, type Ref} from 'vue'
+import axios from "axios";
+
+const api = window?.__RUNTIME_CONFIG__?.API_URL;

 export const useUserInfo = defineStore('userInfo', () => {
  const username: Ref<string | null> = ref(null);
  const userId: Ref<number | null> = ref(null);
+  const gameId: Ref<string | null> = ref(null);

  function setUserInfo(name: string, id: number) {
    username.value = name;
    userId.value = id;
  }

+  function setGameId(id: string) {
+    gameId.value = id;
+  }
+
+  async function requestState() {
+    await axios.get(`${api}/status`, {withCredentials: true}).then((response) => {
+      console.log("STATUS DATA:" + response.data.status + response.data.inGame)
+      if (response.data.status === 'authenticated') {
+        username.value = response.data.username;
+        userId.value = response.data.userId;
+        if (response.data.gameId) {
+          console.log("GAMEID:" + response.data.gameId)
+          gameId.value = response.data.gameId;
+        } else {
+          gameId.value = null;
+        }
+      } else {
+        username.value = null;
+        userId.value = null;
+        gameId.value = null;
+      }
+    })
+  }
+
  function clearUserInfo() {
    username.value = null;
    userId.value = null;
  }

-  return { username, userId, setUserInfo, clearUserInfo };
+  function clearGameId() {
+    gameId.value = null;
+  }
+
+  return { username, userId, gameId, setUserInfo, requestState, clearUserInfo, setGameId, clearGameId };
 });
--- a/src/composables/useWebsocket.ts
+++ b/src/composables/useWebsocket.ts
@@ -1,4 +1,4 @@
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount, watch } from "vue";
 import {
  connectWebSocket,
  disconnectWebSocket,
@@ -6,20 +6,39 @@ import {
  sendEventAndWait,
  onEvent,
  isWebSocketConnected,
+  setDefaultHandler,
 } from "@/services/ws";
+import { useIngame } from "@/composables/useIngame";
+
+function defaultEventHandler<T = any>(data: (data: T) => void) {
+  setDefaultHandler(data);
+}

 export function useWebSocket() {
  const isConnected = ref(isWebSocketConnected());
  const lastMessage = ref<any>(null);
-
  const lastError = ref<string | null>(null);
  
+  // Get ingame store to sync connection state
+  const ig = useIngame();
+
+  // Watch the ingame store's connection state and keep this composable in sync
+  watch(() => ig.isWsConnected, (connected) => {
+    isConnected.value = connected;
+  });
+
+  // Also update this composable's state when connecting/disconnecting
+  const updateConnectionState = (connected: boolean) => {
+    isConnected.value = connected;
+  };
+
  async function safeConnect(url?: string) {
    return connectWebSocket(url)
      .then(() => {
-        isConnected.value = true;
+        updateConnectionState(true);
      })
      .catch((err) => {
+        updateConnectionState(false);
        lastError.value = err?.message ?? "Unknown WS error";
        throw err;
      });
@@ -32,10 +51,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, () => {});
    });
  }
@@ -51,5 +72,6 @@ export function useWebSocket() {
    sendAndWait: sendEventAndWait,

    useEvent,
+    defaultEventHandler
  };
 }
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,25 +5,30 @@ import App from './App.vue'
 import router from './router'
 import Particles from "@tsparticles/vue3";
 import { loadFull } from "tsparticles";
-import { Quasar, Notify, QExpansionItem } from 'quasar'
+import {Quasar, Notify, QExpansionItem, Dialog, Dark} from 'quasar'
 import '@quasar/extras/material-icons/material-icons.css'
+import '@quasar/extras/bootstrap-icons/bootstrap-icons.css'
 import 'quasar/dist/quasar.css'
 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";

 const app = createApp(App)
 const pinia = createPinia()

 app.use(pinia)
+const ui = useIngame();
+initWebSocket(ui);
 app.use(router)
 app.use(Quasar, {
  plugins: {
-    Notify
-  },
-  components: {
-    QExpansionItem
+    Notify,
+    Dialog,
+    Dark
  }
 })
 app.use(VueAxios, axios)
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,7 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import LoginView from '../views/LoginView.vue'
+import RegisterView from '../views/RegisterView.vue'
+import UsernameSelectionView from '../views/UsernameSelectionView.vue'
 import MainMenuView from '../views/MainMenuView.vue'
 import createGameView from '../views/CreateGame.vue'
 import joinGameView from "@/views/JoinGameView.vue";
@@ -7,22 +9,23 @@ 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 OfflineView from "@/views/OfflineView.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 },
+      meta: { requiresAuth: false },
      children: [
        {
          path: '',
          name: 'mainmenu',
          component: defaultMenu,
-          meta: { requiresAuth: true }
+          meta: { requiresAuth: false }
        },
        {
          path: 'create',
@@ -40,7 +43,7 @@ const router = createRouter({
          path: 'rules',
          name: 'rules-Game',
          component: rulesView,
-          meta: {requiresAuth: true }
+          meta: {requiresAuth: false }
        },
      ],
    },
@@ -50,20 +53,73 @@ const router = createRouter({
      component: LoginView,
      meta: { requiresAuth: false }
    },
+    {
+      path: '/register',
+      name: 'register',
+      component: RegisterView,
+      meta: { requiresAuth: false }
+    },
+    {
+      path: '/select-username',
+      name: 'select-username',
+      component: UsernameSelectionView,
+      meta: { requiresAuth: false }
+    },
+    {
+      path: '/game',
+      name: 'game',
+      component: Game,
+      meta: {requiresAuth: true }
+    },
+    {
+      path: '/offline',
+      name: 'offline',
+      component: OfflineView,
+      meta: {requiresAuth: false }
+    }
  ],
 })

 router.beforeEach(async (to, from, next) => {
  const info = useUserInfo();
-  if (!to.meta.requiresAuth) return next();
+  const isOnline = navigator.onLine;
+  
+  if (to.name === 'offline') {
+    if (isOnline) {
      try {
-    await axios.get(`${api}/userInfo`, { withCredentials: true }).then(
-      res => {
-        info.setUserInfo(res.data.username, res.data.userId);
+        await info.requestState();
+        if (!info.username) {
+          info.clearUserInfo();
+          return next('/login');
+        }
+        return next({ name: 'mainmenu' });
+      } catch (err) {
+        info.clearUserInfo();
+        return next('/login');
+      }
+    } else {
+      return next();
+    }
+  }
+  
+  if (!isOnline) {
+    return next({ name: 'offline' });
+  }
+
+  if (!to.meta.requiresAuth) return next();
+  
+  try {
+    await info.requestState();
+    if (!info.username) {
+      info.clearUserInfo();
+      return next('/login');
+    }
+    if (info.gameId && to.name !== 'game') {
+      return next({ name: 'game' });
    }
-    );
    next();
  } catch (err) {
+    console.error("Routing Error", err);
    info.clearUserInfo();
    next('/login');
  }
--- a/src/runtimeConfig.ts
+++ b/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;
+}
--- a/src/services/ws.ts
+++ b/src/services/ws.ts
@@ -1,4 +1,8 @@
-const api = window.__RUNTIME_CONFIG__?.API_URL;
+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"

 // ---------- Types ---------------------------------------------------------

@@ -6,6 +10,8 @@ export type ServerMessage<T = any> = {
  id?: string;
  event?: string;
  status?: "success" | "error";
+  state?: "Lobby" | "InGame" | "SelectTrump" | "TieBreak" | "FinishedMatch";
+  stateData?: GameInfo | LobbyInfo | TieInfo | TrumpInfo | WonInfo;
  data?: T;
  error?: string;
 };
@@ -28,9 +34,15 @@ let ws: WebSocket | null = null;

 const pending = new Map<string, PendingEntry>();
 const handlers = new Map<string, HandlerFn>();
+let uState: ReturnType<typeof useIngame> | null = null;

 let heartbeatTimer: ReturnType<typeof setInterval> | null = null;

+export function initWebSocket(ingameStore: ReturnType<typeof useIngame>) {
+  uState = ingameStore;
+}
+let defaultHandler: HandlerFn | null = null;
+
 function uuid(): string {
  return crypto.randomUUID();
 }
@@ -62,6 +74,10 @@ function stopHeartbeat() {
 }

 function setupSocketHandlers(socket: WebSocket) {
+  if (!uState) {
+    console.error("[WS] WebSocket module not initialized with Pinia store!");
+    return;
+  }
  socket.onmessage = async (raw) => {
    console.debug("[WS] MESSAGE:", raw.data);

@@ -73,7 +89,7 @@ function setupSocketHandlers(socket: WebSocket) {
      return;
    }

-    const { id, event, status, data } = msg;
+    const { id, event, state, stateData, status, data } = msg;

    // RPC response branch
    if (id && status) {
@@ -91,6 +107,14 @@ function setupSocketHandlers(socket: WebSocket) {
      return;
    }

+    if (state && stateData) {
+      console.debug("[WS] State change:", state, stateData);
+      if(uState) {
+        console.debug("[WS] State change cascade:", state, stateData);
+        uState.setIngame(state, stateData);
+      }
+    }
+
    // Server event → handler branch
    if (id && event) {
      const handler = handlers.get(event);
@@ -103,7 +127,17 @@ function setupSocketHandlers(socket: WebSocket) {

      if (!handler) {
        console.warn("[WS] No handler for event:", 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;
      }

@@ -126,18 +160,22 @@ function setupSocketHandlers(socket: WebSocket) {
    stopHeartbeat();
    failAllPending("WebSocket closed");

+    if (uState) {
+      uState.setWsConnected(false);
+    }
+
    if (ev.wasClean) {
      console.log(`[WS] Closed cleanly: code=${ev.code} reason=${ev.reason}`);
    } else {
      console.warn("[WS] Connection died");
    }
-
-    // You redirect here — if you don’t want auto reconnect, keep as is.
-    location.href = "/mainmenu";
  };
 }

 export function connectWebSocket(url?: string): Promise<void> {
+  if (!url) {
+    url = window.__RUNTIME_CONFIG__?.WEBSOCKET_URL
+  }
  if (!url) {
    const loc = window.location;
    const protocol = loc.protocol === "https:" ? "wss:" : "ws:";
@@ -154,6 +192,9 @@ export function connectWebSocket(url?: string): Promise<void> {
      const prevOnError = ws!.onerror;
      ws!.onopen = (ev) => {
        if (prevOnOpen) prevOnOpen.call(ws!, ev);
+        if (uState) {
+          uState.setWsConnected(true);
+        }
        resolve();
      };
      ws!.onerror = (err) => {
@@ -170,6 +211,9 @@ export function connectWebSocket(url?: string): Promise<void> {
  return new Promise((resolve, reject) => {
    ws!.onopen = () => {
      console.log("[WS] Connected");
+      if (uState) {
+        uState.setWsConnected(true);
+      }
      startHeartbeat();
      resolve();
    };
@@ -187,6 +231,9 @@ export function disconnectWebSocket(code = 1000, reason = "Client disconnect") {
      ws.close(code, reason);
    } catch {}
    ws = null;
+    if (uState) {
+      uState.setWsConnected(false);
+    }
  }
 }

@@ -232,5 +279,9 @@ export function onEvent(event: string, handler: HandlerFn) {
  handlers.set(event, handler);
 }

+export function setDefaultHandler(handler: HandlerFn) {
+  defaultHandler = handler;
+}
+
 export const isWebSocketConnected = () =>
  !!ws && ws.readyState === WebSocket.OPEN;
--- a/src/types/GameSubTypes.ts
+++ b/src/types/GameSubTypes.ts
@@ -11,12 +11,12 @@ type Hand = {
 type Player = {
  id: string
  name: string
-  dogLife: string
+  dogLife: boolean
 }

 type PlayerQueue = {
  currentPlayer: Player | null
-  players: Player[]
+  queue: Player[]
 }

 type PodiumPlayer = {
@@ -34,7 +34,7 @@ type Round = {
 }

 type Trick = {
-  cards: { [player: string]: Card }
+  cards: { [key: string]: Card} | null
  firstCard: Card | null
  winner: Player | null
 }
--- a/src/types/GameTypes.ts
+++ b/src/types/GameTypes.ts
@@ -5,7 +5,8 @@ import type {
  PodiumPlayer,
  Round,
  Trick,
-  User
+  User,
+  Card
 } from "@/types/GameSubTypes.ts";


@@ -31,6 +32,8 @@ type TieInfo = {
  self: Player | null
  tiedPlayers: Player[]
  highestAmount: number
+  selectedCards: Record<string, Card>
+  winners: Player[] | null
 }

 type TrumpInfo = {
--- a/src/views/CreateGame.vue
+++ b/src/views/CreateGame.vue
@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import axios from "axios";
+import {useUserInfo} from "@/composables/useUserInfo";

 const api = window?.__RUNTIME_CONFIG__?.API_URL;
 const lobbyName = ref('');
@@ -11,14 +12,14 @@ const playerAmount = ref(2);
 const $q = useQuasar();
 const isLoading = ref(false);
 const router = useRouter();
-const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+const info = useUserInfo();
 const createGameQuasar = async () => {
  if (!lobbyName.value) {
    $q.notify({ message: 'Lobby-Name wird benötigt', color: 'red', position: 'top', icon: 'cancel' });
    return;
  }
  isLoading.value = true;
-  axios.post(`${api}/createGame`, {lobbyname: lobbyName.value, playeramount: playerAmount.value.toString()}, {withCredentials: true}).then((response) => {
+  axios.post(`${api}/createGame`, {lobbyname: lobbyName.value, playeramount: playerAmount.value.toString()}, {withCredentials: true}).then(async (response) => {
    const responseData = response.data
    console.log("Response" + responseData.status)
    $q.notify({
@@ -27,12 +28,12 @@ const createGameQuasar = async () => {
      icon: 'check_circle',
      position: 'top'
    });
-    router.push("/lobby")
+    await info.requestState();
+    router.replace("/game")
  }).catch((err) => {
    console.log("ERROR:" + err)
-  }).finally(() =>
    isLoading.value = false
-  )
+  })
 }
 </script>

--- a/src/views/Game.vue
+++ b/src/views/Game.vue
@@ -0,0 +1,56 @@
+<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";
+import {ref, watch} from "vue";
+
+const wb = useWebSocket()
+const ig = useIngame()
+const { state } = storeToRefs(ig)
+const ui = useUserInfo()
+const $q = useQuasar();
+
+
+ui.requestState().then(() => {
+  if (ui.gameId == null) {
+    $q.notify({
+      message: "You're not in any game!",
+      color: "negative"
+    })
+    router.replace("/")
+  } else {
+    ig.requestGame(ui.gameId).then(() => {
+      // Attempt to connect to WebSocket
+      wb.connect().catch((err) => {
+        console.error('[Game] Initial WebSocket connection failed:', err);
+        $q.notify({
+          message: 'Failed to connect to game server. Please try reconnecting.',
+          color: 'negative',
+          icon: 'error',
+          timeout: 5000
+        });
+      });
+    })
+  }
+})
+</script>
+
+<template>
+  <div class="lobby-background">
+    <Ingame v-if="state === 'InGame' || state === 'SelectTrump' || state === 'TieBreak'"/>
+    <lobby-component v-if="state === 'Lobby'"/>
+  </div>
+</template>
+
+<style scoped>
+.lobby-background {
+  background-color: var(--body-background-color);
+  width: 100%;
+  min-height: 100vh;
+}
+</style>
--- a/src/views/JoinGameView.vue
+++ b/src/views/JoinGameView.vue
@@ -1,28 +1,58 @@
 <script setup lang="ts">
-import {ref} from "vue";
+import {ref, onUnmounted} from "vue";
 import { useRouter } from 'vue-router';
 import {useQuasar} from "quasar";
+import axios from "axios";
+import {useUserInfo} from "@/composables/useUserInfo";
 const router = useRouter();
+const info = useUserInfo();
 const lobbyCode = ref('');
 const isLoading = ref(false);
 const $q = useQuasar();
-const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+const api = window?.__RUNTIME_CONFIG__?.API_URL;
+
+let pollInterval: number | null = null;
+
+onUnmounted(() => {
+  if (pollInterval) {
+    clearInterval(pollInterval);
+  }
+});
+
 const startGameQuasar = async() => {
  if (!lobbyCode.value) {
    $q.notify({ message: 'Lobby-Name wird benötigt', color: 'red', position: 'top', icon: 'cancel' });
    return;
  }
  isLoading.value = true;
-  //TODO: Implement Logic to Start the Game and Redirect to Ingame
-  await delay(3000)
-  isLoading.value = false;
+  axios.post(`${api}/joinGame/${lobbyCode.value.toString()}`, {}, {withCredentials: true}).then(() => {
    $q.notify({
      message: `Lobby "${lobbyCode.value}" erfolgreich gefunden`,
      color: 'green-6',
      icon: 'check_circle',
      position: 'top'
    });
-  router.push({ name: 'mainmenu'});
+
+    // Start polling until gameId is set
+    pollInterval = window.setInterval(async () => {
+      await info.requestState();
+      if (info.gameId) {
+        if (pollInterval) {
+          clearInterval(pollInterval);
+          pollInterval = null;
+        }
+      }
+    }, 100);
+
+  }).catch(() => {
+    $q.notify({
+      message: `Lobby "${lobbyCode.value}" nicht gefunden`,
+      color: 'red-6',
+      icon: 'cancel',
+      position: 'top'
+    })
+    isLoading.value = false
+  })
 }
 </script>

--- a/src/views/LobbyView.vue
+++ b/src/views/LobbyView.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import {computed, ref} from 'vue';
+import LobbyComponent from '../components/lobby/LobbyComponent.vue';
+import type {LobbyInfo} from "@/types/GameTypes.ts";
+import type {User} from "@/types/GameSubTypes.ts";
+import {useIngame} from "@/composables/useIngame.ts";
+import {sendEvent} from "@/services/ws.ts";
+
+const ig = useIngame()
+
+const lobbyInfo = computed<LobbyInfo | null>(() => {
+  if (ig.state === 'Lobby' && ig.data) {
+    return ig.data as LobbyInfo;
+  }
+  return null;
+});
+
+const handleKickPlayer = (user: User) => {
+  sendEvent("KickEvent", {
+    user: user
+  })
+};
+
+const handleStartGame = () => {
+  //TODO: Implement start game
+};
+
+const handleLeaveGame = (user: User) => {
+  sendEvent("LeftEvent",{
+    user: user
+    })
+};
+</script>
+
+<template>
+  <q-layout>
+    <q-page-container>
+      <q-page class="vh-100 column">
+        <lobby-component
+          v-if="lobbyInfo"
+          :lobbyInfo="lobbyInfo"
+          @kick-player="handleKickPlayer"
+          @start-game="handleStartGame"
+          @leave-game="handleLeaveGame"
+        />
+      </q-page>
+    </q-page-container>
+  </q-layout>
+</template>
+
+<style scoped>
+
+</style>
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -1,59 +1,111 @@
 <template>
-  <div class="login-box q-col-gutter-sm">
-    <div class="text-h3 text-center row">
-      <img src="/logo.png" alt="Logo" style="height: 60px; margin-right: 10px;" />
+  <div class="login-container">
+    <div class="login-box">
+      <div class="logo-section">
+        <div class="logo-container">
+          <img src="/logo.png" alt="Logo" class="logo" />
+          <div class="logo-text">KnockOut Whist</div>
+        </div>
      </div>
-    <q-form @submit.prevent="onSubmit"
-            class="q-gutter-md row justify-center"
-            style="width: 100%">

-      <div class="row q-col-gutter-sm" style="width: 100%">
+      <div class="content-section">
+        <h1 class="title">Welcome Back</h1>
+
+        <q-form @submit.prevent="onSubmit" class="form-section">
          <q-input
-          style="width: 100%"
-          filled
-          dark
-          label-color="white"
-          color="white"
            v-model="username"
-          label="Username *"
-
+            label="Username"
+            filled
+            color="primary"
+            label-color="grey-6"
            :error="!!loginError"
            :error-message="loginError"
-
+            class="form-input"
            lazy-rules
            :rules="[ val => val && val.length > 0 || 'Username is required']"
-        />
-      </div>
+          >
+            <template v-slot:prepend>
+              <q-icon name="person" color="grey-6" />
+            </template>
+          </q-input>

-      <div class="row q-col-gutter-sm" style="width: 100%">
          <q-input
-          style="width: 100%"
-          filled
-          dark
-          type="password"
-          label-color="white"
-          color="white"
            v-model="password"
-          label="Password *"
+            label="Password"
+            filled
+            type="password"
+            color="primary"
+            label-color="grey-6"
            :error="!!loginError"
            :error-message="loginError"
-
+            class="form-input"
            lazy-rules
            :rules="[
              val => !!val || 'Password is required'
            ]"
+          >
+            <template v-slot:prepend>
+              <q-icon name="lock" color="grey-6" />
+            </template>
+          </q-input>
+
+          <div class="action-buttons">
+            <q-btn
+              type="submit"
+              label="Sign In"
+              color="primary"
+              class="submit-btn"
+              :loading="inProgress"
+              size="md"
+              rounded
+            />
+          </div>
+        </q-form>
+
+        <div class="divider-section">
+          <div class="divider">
+            <span class="divider-text">Or continue with</span>
+          </div>
+        </div>
+
+        <div class="social-buttons">
+          <q-btn
+            @click="loginWithProvider('discord')"
+            class="social-btn discord-btn"
+            size="md"
+            rounded
+            icon="discord"
+            label="Discord"
+            />
+          <q-btn
+            @click="loginWithProvider('keycloak')"
+            class="social-btn keycloak-btn"
+            size="md"
+            rounded
+            icon="emoji_people"
+            label="Keycloak"
            />
        </div>

-      <div class="row justify-center">
-        <q-btn type="submit" label="Login" push color="dark" />
+        <div class="register-link">
+          <span class="register-text">Don't have an account?</span>
+          <q-btn
+            flat
+            color="primary"
+            label="Register"
+            @click="goToRegister"
+            class="register-btn"
+            size="md"
+            dense
+          />
+        </div>
      </div>
-    </q-form>
    </div>
    <vue-particles
      id="particles-js"
      :options='options'
    />
+  </div>
 </template>

 <script lang="ts" setup>
@@ -80,7 +132,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(() =>
@@ -88,6 +140,14 @@ const onSubmit = () => {
  )
 }

+const loginWithProvider = (provider: string) => {
+  window.location.href = `${api}/auth/${provider}`
+}
+
+const goToRegister = () => {
+  router.push('/register')
+}
+
 const options = {
  "particles": {
    "number": {
@@ -200,19 +260,213 @@ const options = {
 </script>

 <style scoped>
-.login-box {
-  position: fixed;
+.login-container {
+  position: relative;
+  display: flex;
  align-items: center;
  justify-content: center;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  display: flex;
+  overflow: hidden;
+  padding: 2rem;
+  box-sizing: border-box;
+}
+
+.login-box {
  width: 100%;
  max-width: 420px;
-  padding: 1rem;
+  height: 100%;
+  max-height: calc(100vh - 1rem);
+  background: var(--color-background-soft);
+  backdrop-filter: blur(20px);
+  border-radius: 24px;
+  overflow-y: auto;
+  overflow-x: hidden;
  z-index: 2;
-  background-color: var(--color-background);
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--color-border);
+  box-sizing: border-box;
+  box-shadow: 0 10px 10px rgba(0, 0, 0, 0.5);
+}
+
+.logo-section {
+  background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
+  padding: 2rem;
+  text-align: center;
+  border-bottom: 1px solid var(--color-border);
+}
+
+.logo-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 1rem;
+}
+
+.logo {
+  height: 50px;
+  width: auto;
+  filter: brightness(0) invert(1);
+}
+
+.logo-text {
+  color: #ffffff;
+  font-size: 1.5rem;
+  font-weight: 700;
+  letter-spacing: 0.5px;
+}
+
+.content-section {
+  padding: 1.5rem;
+}
+
+.title {
+  color: var(--color-heading);
+  font-size: 1.8rem;
+  font-weight: 700;
+  text-align: center;
+  margin-bottom: 0.5rem;
+}
+
+.subtitle {
+  color: var(--color-text);
+  text-align: center;
+  margin-bottom: 2rem;
+  font-size: 0.95rem;
+  line-height: 1.5;
+  opacity: 0.8;
+}
+
+.form-section {
+  display: flex;
+  flex-direction: column;
+  gap: 1.5rem;
+  margin-bottom: 2rem;
+}
+
+.form-input {
+  border-radius: 12px;
+}
+
+.action-buttons {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  margin-top: 1rem;
+}
+
+.submit-btn {
+  width: 100%;
+  height: 48px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  border: none;
+}
+
+.divider-section {
+  margin: 2rem 0;
+}
+
+.divider {
+  position: relative;
+  text-align: center;
+}
+
+.divider::before {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 0;
+  right: 0;
+  height: 1px;
+  background: var(--color-border);
+}
+
+.divider-text {
+  background: var(--color-background-soft);
+  padding: 0 1rem;
+  color: var(--color-text);
+  font-size: 0.85rem;
+  position: relative;
+  opacity: 0.7;
+}
+
+.social-buttons {
+  display: flex;
+  gap: 1rem;
+  margin-bottom: 2rem;
+}
+
+.social-btn {
+  flex: 1;
+  height: 48px;
+  background: var(--color-background-mute);
+  border: 2px solid var(--color-border);
+  color: var(--color-heading);
+  font-weight: 500;
+  transition: all 0.3s ease;
+}
+
+.social-btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
+}
+
+.discord-btn:hover {
+  border-color: #5865F2;
+  background: rgba(88, 101, 242, 0.1);
+}
+
+.keycloak-btn:hover {
+  border-color: #0088CC;
+  background: rgba(0, 136, 204, 0.1);
+}
+
+
+.register-link {
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+}
+
+.register-text {
+  color: var(--color-text);
+  font-size: 0.9rem;
+  opacity: 0.7;
+}
+
+.register-btn {
+  font-weight: 600;
+  text-transform: none;
+}
+
+#particles-js {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+}
+
+@media (max-width: 600px) {
+  .login-box {
+    max-width: 100%;
+    border-radius: 16px;
+    max-height: calc(100vh - 1rem);
+  }
+
+  .content-section {
+    padding: 1rem;
+  }
+
+  .title {
+    font-size: 1.5rem;
+  }
+
+  .social-buttons {
+    flex-direction: column;
+  }
 }
 </style>
--- a/src/views/MainMenuView.vue
+++ b/src/views/MainMenuView.vue
@@ -1,17 +1,39 @@
 <script setup lang="ts">
-import MainMenuBoxes from "@/components/MainMenuBoxes.vue";
+import UserStatusArea from '../components/User.vue'
 </script>

 <template>
  <q-layout view="hHh lpR fFf" class="font-roboto">
-    <q-page-container>
-      <q-page class="flex justify-start items-center column">
+    <q-header elevated class="bg-dark text-white">
+      <q-toolbar>
+        <q-toolbar-title class="q-ml-md">
+        </q-toolbar-title>

-        <header class="text-center q-mb-xl">
+        <UserStatusArea />
+      </q-toolbar>
+    </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">
+            <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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
TeamCity	b0f08be29e	ci: bump version to v0.25.0	2026-01-22 00:15:13 +00:00
lq64	9823af2a1c	feat(ui): FRO-26: Tie Component (#30 ) Added a nice tie component Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #30	2026-01-22 01:12:08 +01:00
TeamCity	65591ad392	ci: bump version to v0.24.0	2026-01-20 18:31:14 +00:00
Janis	cd950e9521	feat: Update docker-entrypoint.sh and vite.config.ts for improved runtime handling and API navigation	2026-01-20 19:28:50 +01:00
TeamCity	c2dfa0e701	ci: bump version to v0.23.1	2026-01-20 11:31:51 +00:00
Janis	d3709ed852	feat/auth (#29 ) Reviewed-on: #29 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2026-01-20 12:28:20 +01:00
TeamCity	6b8488e7a4	ci: bump version to v0.23.0	2026-01-13 13:36:42 +00:00
lq64	6c914b1421	feat(ui): Tie selection (#26 ) Added a minimal ui for the tie selection. Tie selection gets sent to the server via websocket and gets response from it. Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #26	2026-01-13 14:33:35 +01:00
TeamCity	8482aa8876	ci: bump version to v0.22.0	2026-01-07 21:37:08 +00:00
Janis	c6537467f8	feat: Update LobbyComponent to use icons for player removal buttons	2026-01-07 22:34:23 +01:00
TeamCity	3eb505806c	ci: bump version to v0.21.0	2026-01-07 21:05:21 +00:00
Janis	058d232d2b	feat: Implement PlayDogCard functionality in user session and update Vue component	2026-01-07 22:02:21 +01:00
TeamCity	67dcf6274c	ci: bump version to v0.20.0	2026-01-07 20:45:36 +00:00
Janis	02869fff8b	feat: Enhance user state management with polling and WebSocket connection handling	2026-01-07 21:43:17 +01:00
TeamCity	ef073afd5e	ci: bump version to v0.19.0	2026-01-07 16:00:15 +00:00
Janis	92a7bc0586	feat: Update joinGame endpoint to accept gameId as a path parameter	2026-01-07 16:56:34 +01:00
TeamCity	352b7fd3ff	ci: bump version to v0.18.0	2026-01-07 13:37:03 +00:00
Janis	3a62fbc129	Merge remote-tracking branch 'origin/main'	2026-01-07 14:33:44 +01:00
Janis	d8b3904cbc	feat: Add caching headers for env.js in Nginx configuration	2026-01-07 14:33:34 +01:00
TeamCity	c1960a4e33	ci: bump version to v0.17.0	2026-01-07 13:21:19 +00:00
Janis	93e5af7402	feat: Add caching headers for env.js in Nginx configuration	2026-01-07 14:18:32 +01:00
TeamCity	fa900a3b56	ci: bump version to v0.16.2	2026-01-07 11:51:38 +00:00
TeamCity	862be6eaff	ci: bump version to v0.16.1	2026-01-06 14:43:07 +00:00
TeamCity	8541af95f2	ci: bump version to v0.16.0	2026-01-06 14:26:03 +00:00
Janis	e972f1c432	feat: Update Dockerfile for multi-platform support and add nginx configuration	2026-01-06 15:23:33 +01:00
Janis	37b88a108c	feat: Update Dockerfile for multi-platform support and add nginx configuration	2026-01-06 15:21:19 +01:00
TeamCity	91b54d67fa	ci: bump version to v0.15.0	2026-01-06 11:09:38 +00:00
Janis	db5c70d02a	feat: Enhance win effects and animations in OfflineView component	2026-01-06 12:07:08 +01:00
Janis	8aa07388ac	feat: Enhance win effects and animations in OfflineView component	2025-12-18 11:20:58 +01:00
Janis	6b3eaf2c70	feat: Enhance win effects and animations in OfflineView component	2025-12-18 11:20:05 +01:00
lq64	2fbfca32a0	feat/FRO-36: PWA (#25 ) Added a PWA for knockoutwhist including a special offline screen. Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #25 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-18 09:46:23 +01:00
lq64	9feb4a93b8	feat/FRO-33: Added a nice Select Trumpsuit Component (#24 ) Added a nice working trumpsuit component with animations Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #24 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-18 09:44:46 +01:00
TeamCity	ee8523d51a	ci: bump version to v0.14.0	2025-12-15 09:08:10 +00:00
lq64	70a44fd1ea	feat(ui): FRO-5 Animation Card Played (#23 ) 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>	2025-12-15 10:06:02 +01:00
lq64	bb6355d9ed	feat(ui): FRO-34 Lobby (#21 ) Started with Lobby Component Co-authored-by: LQ63 <lkhermann@web.de> Co-authored-by: Janis <janis-e@gmx.de> Reviewed-on: #21 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-14 15:10:27 +01:00
TeamCity	f0623dbfb2	ci: bump version to v0.13.0	2025-12-11 10:02:21 +00:00
lq64	d73b4f396b	feat(ui): FRO-35 Animations (#22 ) Added animations for mainmenu Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #22 Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-11 11:00:49 +01:00
TeamCity	bda06a37cc	ci: bump version to v0.12.1	2025-12-10 23:17:06 +00:00
lq64	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
Janis	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
TeamCity	7c8cf6503b	ci: bump version to v0.11.0	2025-12-10 16:09:56 +00:00
lq64	f05f10ea56	feat(ui): FRO-13 User Component (#18 ) Added possibility to log off as a user Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #18 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-10 17:08:23 +01:00
TeamCity	43920b25f3	ci: bump version to v0.10.0	2025-12-10 15:47:51 +00:00
Janis	21db939d34	feat: FRO-24 Create Played Cards Component (#17 ) Reviewed-on: #17 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-10 16:46:34 +01:00
TeamCity	0b05cba25f	ci: bump version to v0.9.0	2025-12-10 14:47:18 +00:00
lq64	14e001cae6	feat(api): FRO-15 Join Game (#16 ) Added join game functionality Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #16 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-10 15:45:56 +01:00
TeamCity	fc60234faf	ci: bump version to v0.8.0	2025-12-10 14:44:38 +00:00
Janis	b20ec0a363	feat: FRO-23 Create Player Hand Component (#15 ) Reviewed-on: #15 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-10 15:43:27 +01:00