ci: bump version to v0.24.0

feat: Update docker-entrypoint.sh and vite.config.ts for improved runtime handling and API navigation
ci: bump version to v0.23.1
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 · 2026-01-13 13:36:42 +00:00 · 2026-01-13 14:33:35 +01:00
43 changed files with 6875 additions and 406 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ coverage

 # Vitest
 __screenshots__/
+/dev-dist/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,3 +103,71 @@
 ### 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))
--- 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/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
@@ -1,50 +1,101 @@
 <script setup lang="ts">

 import {useIngame} from "@/composables/useIngame.ts";
-import type {GameInfo} from "@/types/GameTypes.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">
-
-      <q-row class="q-gutter-md q-mx-md">
-        <q-col cols="4" class="mt-5 text-start">
-          <TurnC v-if="(ig.data as GameInfo)?.playerQueue" :queue="(ig.data as GameInfo).playerQueue!"/>
-        </q-col>
-
-        <q-col cols="4" class="text-center">
-          <ScoreboardC v-if="(ig.data as GameInfo)?.currentRound" :current-round="(ig.data as GameInfo).currentRound!" />
-
-          <div class="d-flex justify-content-center g-3 mb-5">
-            <PlayedCardsC v-if="(ig.data as GameInfo)?.currentTrick" :trick="(ig.data as GameInfo).currentTrick!" />
+          <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>
-        </q-col>
+          </transition>


-        <q-col cols="4" class="mt-5 text-end">
-          <GameInfoC v-if="(ig.data as GameInfo)?.currentRound"
-                     :first-card="(ig.data as GameInfo).currentTrick?.firstCard ?? null"
-                     :trumpsuit="(ig.data as GameInfo).currentRound!.trumpSuit"/>
-        </q-col>
-      </q-row>
+          <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>

-      <q-row justify="center" class="q-gutter-sm mt-4 bottom-div" style="backdrop-filter: blur(4px); margin-left: 0; margin-right: 0;">
-        <q-col cols="12" class="flex justify-center">
-          <HandC v-if="(ig.data as GameInfo)?.hand && (ig.data as GameInfo)?.self" :hand="(ig.data as GameInfo).hand!" :self="(ig.data as GameInfo).self"/>
-        </q-col>
-      </q-row>
+          <div 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>
@@ -59,4 +110,28 @@ const ig = useIngame()
 .ingame-side-shadow {
  box-shadow: 0 1px 15px 0 #000000
 }
+.bottom-div {
+  position: fixed;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  max-width: 1400px;
+  width: 100%;
+  margin: 0;
+  text-align: center;
+  padding: 10px;
+}
+.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
@@ -68,8 +68,21 @@ const handleLogoff = () => {
      </q-menu>
    </div>

-    <div v-else class="text-caption text-grey-4">
-      Not Logged In
+    <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>
--- a/src/components/ingame/GameInfoC.vue
+++ b/src/components/ingame/GameInfoC.vue
@@ -11,7 +11,7 @@ const {trumpsuit, firstCard} = toRefs(props)


 const trumpName = computed(() => {
-  switch (trumpsuit.value.path.charAt(trumpsuit.value.path.length - 1)) {
+  switch (trumpsuit.value.identifier.charAt(1) as string) {
    case 'S':
      return 'Spades'
    case 'H':
@@ -36,14 +36,12 @@ const trumpName = computed(() => {

    <div class="q-mt-md">
      <div class="text-subtitle1 q-mb-xs q-font-medium">First Card</div>
-      <div id="first-card-container" class="q-pa-sm bg-grey-2 rounded shadow-2"
+      <div id="first-card-container" class="q-pa-sm rounded shadow-2"
           style="display:inline-block;">
        <q-img v-if="firstCard" :src="firstCard.path" alt="First Card" class="firstbox"
               style="width: 80px; border-radius: 6px;"/>
-        <div v-else class="q-pa-sm"
-             style="width: 80px; height: 120px; display:flex; align-items:center; justify-content:center; border-radius:6px; background: #ffffff; color: #666;">
-          No image
-        </div>
+        <q-img v-else src="/images/cards/1B.png" alt="First Card" class="firstbox"
+               style="width: 80px; border-radius: 6px;"/>
      </div>
    </div>
  </div>
--- a/src/components/ingame/HandC.vue
+++ b/src/components/ingame/HandC.vue
@@ -1,47 +1,56 @@
 <script lang="ts" setup>
-import {toRefs} from 'vue'
-import type {Hand, Player} from "@/types/GameSubTypes.ts";
 import {useWebSocket} from "@/composables/useWebsocket.ts";
+import {useIngame} from "@/composables/useIngame.ts";
+import type {GameInfo} from "@/types/GameTypes.ts";
+import {useQuasar} from "quasar";
+import { ref } from 'vue';

 const wb = useWebSocket()
+const wi = useIngame()
+const $q = useQuasar();

-const props = defineProps<{
-  hand: Hand
-  isHandInactive?: boolean
-  self: Player | null
-}>()
+const wiggleIdx = ref<number | null>(null)
+let wiggleTimer: ReturnType<typeof setTimeout> | null = null

-const { hand, isHandInactive, self } = toRefs(props)
-
-function handlePlayCard(element: any, index: number | null) {
-  if (index === null) return
-  if (isHandInactive?.value) return
-  isHandInactive.value = true
-
-  const wiggleKeyframes = [
-    { transform: 'translateX(0)' },
-    { transform: 'translateX(-5px)' },
-    { transform: 'translateX(5px)' },
-    { transform: 'translateX(-5px)' },
-    { transform: 'translateX(0)' }
-  ];
-
-  const wiggleTiming = {
-    duration: 400,
-    iterations: 1,
-    easing: 'ease-in-out',
-    fill: 'forwards'
-  };
-
-  wb.sendAndWait("PlayCard", { cardindex: index })
-    .catch(() => {
-      element.animate(wiggleKeyframes, wiggleTiming);
-      isHandInactive.value = false;
-    })
+function 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() {
-  //TODO: Add some animation or feedback for skipping turn
+  wb.sendAndWait("PlayDogCard", { cardindex: 'Skip' }).catch((error) => {
+    $q.notify({
+      message: error.message,
+      color: "negative",
+      position: "top"
+    })
+  })
 }

 function getCardImagePath(cardPath: string) {
@@ -52,16 +61,22 @@ function getCardImagePath(cardPath: string) {
 </script>

 <template>
-  <div class="bottom-div hand-container">
-    <div id="card-slide" :class="'ingame-cards-slide ' + (isHandInactive ? 'inactive' : '' )">
-      <div class="cards-row">
-        <div v-for="card in hand.cards" :key="card.identifier" class="handcard">
-          <div class="card-btn" @click="handlePlayCard(this, card.idx)" aria-label="Play card">
-            <q-img :src="getCardImagePath(card.path)" :alt="card.identifier" class="card" />
+  <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>
-      </div>
-      <div v-if="self?.dogLife" class="dog-actions">
+      </transition-group>
+      <div v-if="(<GameInfo>wi.data)?.self?.dogLife" class="dog-actions">
        <q-btn color="negative" label="Skip Turn" @click="handleSkipDogLife" />
      </div>
    </div>
@@ -119,6 +134,18 @@ function getCardImagePath(cardPath: string) {
  width:120px;
  border-radius:6px
 }
+.wiggle {
+  animation: wiggle 700ms ease-in-out;
+}
+
+@keyframes wiggle {
+  0% { transform: translateY(0) rotate(0deg); }
+  15% { transform: translateY(-8px) rotate(-6deg); }
+  35% { transform: translateY(0) rotate(6deg); }
+  55% { transform: translateY(-4px) rotate(-3deg); }
+  75% { transform: translateY(0) rotate(2deg); }
+  100% { transform: translateY(0) rotate(0deg); }
+}

@media (max-height: 500px) {
  .card {
@@ -126,4 +153,18 @@ function getCardImagePath(cardPath: string) {
    border-radius: 4px;
  }
 }
+.card-moving {
+  transition: transform 0.5s ease;
+  transition-delay: 1s;
+}
+.card-move-leave-active {
+  position: absolute;
+  transition: all 0.5s ease;
+  pointer-events: none;
+}
+
+.card-move-leave-to {
+  opacity: 0;
+  transform: translateY(-400px);
+}
 </style>
--- a/src/components/ingame/PlayedCardsC.vue
+++ b/src/components/ingame/PlayedCardsC.vue
@@ -6,12 +6,15 @@ const props = defineProps<{ trick: Trick }>()
 const {trick } = toRefs(props)

 const playedCards = computed(() => {
-  return [...trick.value.cards].map(card => {
-    return {
-      cardId: card[1].path,
-      player: card[0].name
-    }
+  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) {
--- a/src/components/ingame/ScoreboardC.vue
+++ b/src/components/ingame/ScoreboardC.vue
@@ -1,9 +1,11 @@
 <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 => {
@@ -11,6 +13,7 @@ const playerScores: PlayerScore[] = props.currentRound.playersIn.map(player => {
      }).length
    }
  })
+})
 </script>

 <template>
--- a/src/components/ingame/TieC.vue
+++ b/src/components/ingame/TieC.vue
@@ -0,0 +1,98 @@
+<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 } from 'vue'
+
+const wb = useWebSocket()
+const wi = useIngame()
+const tieInf = computed(() => wi.data as TieInfo)
+const tieBlankCard = [
+  "/images/cards/AS.png"
+]
+const $q = useQuasar();
+function getCardImagePath(cardPath: string) {
+  if (!cardPath) return ''
+  if (cardPath.includes('://') || cardPath.startsWith('/')) return cardPath
+  return `/${cardPath}`
+}
+function selectTie(tieIndex: number) {
+  wb.sendAndWait("PickTie", { cardIndex: tieIndex }).then(
+    $q.notify({
+      message: "You've successfully picked your tieCard",
+      color: "positive",
+      position: "top"
+    })
+
+  ).catch((error) => {
+    $q.notify({
+      message: error.message,
+      color: "negative",
+      position: "top"
+    })
+  })
+}
+const model = ref(1)
+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>
+  <q-card v-if="tieInf.self?.name === tieInf.currentPlayer?.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">
+        {{ tieInf.self?.name || "Loading Player..."}}
+      </div>
+    </q-card-section>
+    <q-card-section class="bg-dark text-dark text-center q-py-lg">
+      <div class="q-pa-md" style="max-width: 500px">
+        <div class="q-gutter-md">
+          <q-select
+            v-model="model"
+            :options="options"
+            label="Select Amount"
+            filled
+            bg-color="white"
+            label-color="primary"
+            color="primary"
+            popup-content-class="bg-white text-black"
+          />
+          <q-btn
+            color="positive"
+            icon="sports_martial_arts"
+            @click="selectTie(model)"
+            class="full-width"
+          />
+        </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 {{ tieInf.currentPlayer?.name || 'the other player' }} to select card for the tie...
+      </div>
+    </q-card-section>
+  </q-card>
+</template>
+
+<style scoped>
+
+</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
@@ -1,38 +1,63 @@
 <script setup lang="ts">
-import type {LobbyInfo} from "@/types/GameTypes.ts";
 import type {User} from "@/types/GameSubTypes.ts";
+import {useIngame} from "@/composables/useIngame.ts";
+import type {LobbyInfo} from "@/types/GameTypes.ts";
+import {useWebSocket} from "@/composables/useWebsocket.ts";
+import {computed} from "vue";
+import router from "@/router";
+import {useQuasar} from "quasar";

+const wb = useWebSocket()
+const ig = useIngame();
+const $q = useQuasar();

-const props = defineProps<{
-  lobbyInfo: LobbyInfo
-}>()
-const emit = defineEmits<{
-  (e: 'kick-player', user: User): void;
-  (e: 'start-game'): void;
-  (e: 'leave-game', user: User): void;
-}>();
-
-const isHost = props.lobbyInfo.self.host;
-
-const players = props.lobbyInfo.users;
-
-const lobbyName = `${props.lobbyInfo.gameId}`;
+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) {
-    emit('kick-player', user);
+    wb.send("KickPlayer", {playerId: user.id})
  }
 };

 const handleStartGame = () => {
  if (isHost) {
-    emit('start-game');
+    wb.sendAndWait("StartGame", {})
  }
 };

 const handleLeaveGame = (user: User) => {
-  emit('leave-game', user);
+  wb.sendAndWait("LeaveGame", {user: user})
 };
+
+wb.useEvent("SessionClosed", () => {
+  $q.notify({
+    message: `You left the lobby.`,
+    color: "positive"
+  })
+  router.replace("/")
+})
+wb.useEvent("LeftEvent", () => {
+  $q.notify({
+    message: `You left the lobby.`,
+    color: "positive"
+  })
+  router.replace("/")
+})
+
+wb.useEvent("KickEvent", () => {
+  $q.notify({
+    message: `You were kicked from the lobby!`,
+    color: "amber"
+  })
+  router.replace("/")
+})
 const profileIcon = 'person';
 </script>

@@ -44,14 +69,14 @@ const profileIcon = 'person';
      <q-btn
        color="negative"
        label="Exit"
-        @click="handleLeaveGame(props.lobbyInfo.self)"
+        @click="handleLeaveGame((<LobbyInfo>ig.data).self)"
        class="q-ml-auto"
      />
    </div>

    <div class="row q-pb-md">
      <div class="col text-center text-subtitle1">
-        Players: {{ players.length }} / {{ props.lobbyInfo.maxPlayers }}
+        Players: {{ players.length }} / {{ maxPlayers }}
      </div>
    </div>

@@ -65,7 +90,7 @@ const profileIcon = 'person';

              <q-card-section>
                <div class="text-h6">
-                  {{ player.username }} <q-badge v-if="player.id === props.lobbyInfo.self.id" color="orange" align="middle" class="q-ml-xs">
+                  {{ player.username }} <q-badge v-if="player.id === (<LobbyInfo>ig.data).self.id" color="orange" align="middle" class="q-ml-xs">
                  (You)
                </q-badge>
                  <q-badge v-else-if="player.host" color="blue" align="middle" class="q-ml-xs">
@@ -76,16 +101,16 @@ const profileIcon = 'person';

              <q-card-actions align="center" v-if="isHost">
                <q-btn
-                  v-if="player.id !== props.lobbyInfo.self.id"
+                  v-if="player.id !== (<LobbyInfo>ig.data).self.id"
                  color="negative"
-                  label="Remove"
-                  @click="handleKickPlayer(props.lobbyInfo.self)"
+                  icon="sports_martial_arts"
+                  @click="handleKickPlayer(player)"
                  class="full-width"
                />
                <q-btn
                  v-else
                  color="negative"
-                  label="Remove (Cannot Kick Self)"
+                  icon="sports_martial_arts"
                  disable
                  class="full-width"
                />
--- a/src/composables/useIngame.ts
+++ b/src/composables/useIngame.ts
@@ -2,20 +2,26 @@ 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 requestGame(gameId: string) {
-    axios.get(`${api}/status/${gameId}`, {withCredentials: true}).then((response) => {
+  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);
    });
  }
@@ -23,7 +29,8 @@ export const useIngame = defineStore('ingame', () => {
  function clearIngame() {
    state.value = null;
    data.value = null;
+    isWsConnected.value = false;
  }

-  return { state, data, requestGame, setIngame, clearIngame };
+  return { state, data, isWsConnected, requestGame, setIngame, clearIngame, setWsConnected };
 });
--- a/src/composables/useUserInfo.ts
+++ b/src/composables/useUserInfo.ts
@@ -18,14 +18,24 @@ export const useUserInfo = defineStore('userInfo', () => {
    gameId.value = id;
  }

-  function requestState() {
-    axios.get(`${api}/status`, {withCredentials: true}).then((response) => {
+  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;
-      if (response.data.ingame) {
+        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() {
--- 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,
@@ -8,6 +8,7 @@ import {
  isWebSocketConnected,
  setDefaultHandler,
 } from "@/services/ws";
+import { useIngame } from "@/composables/useIngame";

 function defaultEventHandler<T = any>(data: (data: T) => void) {
  setDefaultHandler(data);
@@ -16,15 +17,28 @@ function defaultEventHandler<T = any>(data: (data: T) => void) {
 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;
      });
@@ -37,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, () => {});
    });
  }
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,13 +5,15 @@ 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";

@@ -19,15 +21,14 @@ const app = createApp(App)
 const pinia = createPinia()

 app.use(pinia)
-const ingameStore = useIngame();
-initWebSocket(ingameStore)
+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,23 +9,23 @@ import defaultMenu from "../components/DefaultMenu.vue"
 import axios from "axios";
 import { useUserInfo } from "@/composables/useUserInfo";
 import rulesView from "../components/Rules.vue";
-import LobbyView from "@/views/LobbyView.vue";
-import GameView from "@/views/Game.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',
@@ -41,7 +43,7 @@ const router = createRouter({
          path: 'rules',
          name: 'rules-Game',
          component: rulesView,
-          meta: {requiresAuth: true }
+          meta: {requiresAuth: false }
        },
      ],
    },
@@ -52,25 +54,72 @@ const router = createRouter({
      meta: { requiresAuth: false }
    },
    {
-      path: '/lobby',
-      name: 'lobby',
-      component: LobbyView,
+      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,7 +1,8 @@
 import {useIngame} from "@/composables/useIngame.ts";
 import type {GameInfo, LobbyInfo, TieInfo, TrumpInfo, WonInfo} from "@/types/GameTypes.ts";
+import router from "@/router";

-const api = window.__RUNTIME_CONFIG__?.API_URL;
+const api = "localhost:9000"

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

@@ -107,7 +108,9 @@ function setupSocketHandlers(socket: WebSocket) {
    }

    if (state && stateData) {
+      console.debug("[WS] State change:", state, stateData);
      if(uState) {
+        console.debug("[WS] State change cascade:", state, stateData);
        uState.setIngame(state, stateData);
      }
    }
@@ -157,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:";
@@ -185,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) => {
@@ -201,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();
    };
@@ -218,6 +231,9 @@ export function disconnectWebSocket(code = 1000, reason = "Client disconnect") {
      ws.close(code, reason);
    } catch {}
    ws = null;
+    if (uState) {
+      uState.setWsConnected(false);
+    }
  }
 }

--- a/src/types/GameSubTypes.ts
+++ b/src/types/GameSubTypes.ts
@@ -16,7 +16,7 @@ type Player = {

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

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

 type Trick = {
-  cards: Map<Player, Card>
+  cards: { [key: string]: Card} | null
  firstCard: Card | null
  winner: Player | null
 }
--- 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,13 +12,14 @@ const playerAmount = ref(2);
 const $q = useQuasar();
 const isLoading = ref(false);
 const router = useRouter();
+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({
@@ -26,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
@@ -1,26 +1,49 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import {useWebSocket} from "@/composables/useWebsocket.ts";
 import {useIngame} from "@/composables/useIngame.ts";
 import Ingame from "@/components/Ingame.vue";
 import {useUserInfo} from "@/composables/useUserInfo.ts";
+import LobbyComponent from "@/components/lobby/LobbyComponent.vue";
+import {storeToRefs} from "pinia";
+import {useQuasar} from "quasar";
 import router from "@/router";
+import {ref, watch} from "vue";

 const wb = useWebSocket()
 const ig = useIngame()
+const { state } = storeToRefs(ig)
 const ui = useUserInfo()
+const $q = useQuasar();

-ui.requestState()
-if (ui.gameId) {
-  ig.requestGame(ui.gameId)
-  wb.connect()
-} else {
+
+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="ig.state === 'InGame'" />
+    <Ingame v-if="state === 'InGame' || state === 'SelectTrump' || state === 'TieBreak'"/>
+    <lobby-component v-if="state === 'Lobby'"/>
  </div>
 </template>

--- a/src/views/JoinGameView.vue
+++ b/src/views/JoinGameView.vue
@@ -1,28 +1,49 @@
 <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 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;
-  axios.post(`${api}/joinGame`, {gameId: lobbyCode.value.toString()}, {withCredentials: true}).then(response => {
-    const responseData = response.data
+  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("/lobby")
+
+    // 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`,
@@ -30,9 +51,8 @@ const startGameQuasar = async() => {
      icon: 'cancel',
      position: 'top'
    })
-  }).finally(() =>
    isLoading.value = false
-  )
+  })
 }
 </script>

--- 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
@@ -14,10 +14,26 @@ import UserStatusArea from '../components/User.vue'
    </q-header>

    <q-page-container>
-      <q-page class="flex justify-start items-center column q-pa-md"> <header class="text-center q-mb-xl q-mt-md"> <h1 class="game-title text-white q-my-none">
+      <q-page class="flex justify-start items-center column q-pa-md">
+
+
+          <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/src/views/OfflineView.vue
+++ b/src/views/OfflineView.vue
@@ -0,0 +1,212 @@
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+
+type Symbol = '🍎' | '💎' | '🔔' | '🍒' | '🍋' | '⭐' | '❓';
+const symbols: Symbol[] = ['🍎', '💎', '🔔', '🍒', '🍋', '⭐']
+
+const reelStates = ref([
+  { value: '❓' as Symbol, isSpinning: false },
+  { value: '❓' as Symbol, isSpinning: false },
+  { value: '❓' as Symbol, isSpinning: false }
+])
+
+const globalSpinning = ref(false)
+const hasSpun = ref(false)
+const glowThird = ref(false)
+const winBlink = ref(false)
+const winFire = ref(false)
+let winEffectsTimer: number | undefined
+
+const isWinner = computed(() => {
+  const [r1, r2, r3] = reelStates.value;
+  return hasSpun.value && !globalSpinning.value &&
+    r1?.value !== '❓' && r1?.value === r2?.value && r2?.value === r3?.value
+})
+
+const getRandomSymbol = (): Symbol => symbols[Math.floor(Math.random() * symbols.length)]!
+
+const spin = (): void => {
+  if (globalSpinning.value) return;
+
+  globalSpinning.value = true;
+  hasSpun.value = false;
+  // Reset possible win effects
+  winBlink.value = false;
+  winFire.value = false;
+  if (winEffectsTimer) {
+    clearTimeout(winEffectsTimer);
+    winEffectsTimer = undefined;
+  }
+  reelStates.value.forEach((reel) => {
+    reel.isSpinning = true;
+    reel.value = getRandomSymbol();
+  });
+
+  const base0 = 1500;
+  const gap = 800;
+  const base1 = base0 + gap;
+  const base2 = base1 + gap;
+  setTimeout(() => {
+    reelStates.value[0]!!.isSpinning = false;
+  }, base0);
+  setTimeout(() => {
+    reelStates.value[1]!!.isSpinning = false;
+  }, base1);
+  setTimeout(() => {
+    const firstTwoMatch = reelStates.value[0]!!.value === reelStates!!.value[1]!!.value &&
+      reelStates.value[0]!!.value !== '❓';
+    const extraDelay = firstTwoMatch ? 1000 : 0;
+
+    glowThird.value = firstTwoMatch;
+
+    setTimeout(() => {
+      reelStates.value[2]!!.isSpinning = false;
+      glowThird.value = false;
+      globalSpinning.value = false;
+      hasSpun.value = true;
+
+      const allThreeMatch =
+        reelStates.value[0]!!.value !== '❓' &&
+        reelStates.value[0]!!.value === reelStates.value[1]!!.value &&
+        reelStates.value[1]!!.value === reelStates.value[2]!!.value;
+      if (allThreeMatch) {
+        winFire.value = true;
+        winBlink.value = true;
+        winEffectsTimer = window.setTimeout(() => {
+          winFire.value = false;
+          winBlink.value = false;
+          winEffectsTimer = undefined;
+        }, 3000);
+      }
+    }, base2 - base1 + extraDelay);
+  }, base1);
+};
+</script>
+
+<template>
+  <q-layout>
+    <q-page-container>
+      <q-page class="flex flex-center">
+        <transition
+          appear
+          tag="div"
+          enter-active-class="animate__animated animate__fadeInDown"
+          leave-active-class="animate__animated animate__fadeOutUp"
+        >
+          <q-card class="slot-machine-card q-pa-lg text-center shadow-10">
+            <div class="text-h4 q-mb-md text-black text-weight-bolder " style="font-family: serif;">Offline Drehmaschine</div>
+
+            <div class="row justify-center q-gutter-md q-mb-xl">
+              <div
+                v-for="(reel, index) in reelStates"
+                :key="index"
+                :class="['reel-container', 'shadow-2', (winFire || (glowThird && index === 2)) ? 'glow-fire' : '']"
+              >
+
+                <div v-if="reel.isSpinning" class="reel-strip">
+                  <div v-for="n in 10" :key="n" class="text-h2">{{ symbols[n % symbols.length] }}</div>
+                </div>
+
+                <div v-else :class="['text-h2', 'static-symbol', winBlink ? 'blink-win' : '']">{{ reel.value }}</div>
+
+              </div>
+            </div>
+
+            <div class="result-box q-mb-md" style="height: 40px;">
+              <div v-if="isWinner" class="text-h5 text-positive text-weight-bold animate-bounce">YOU WIN! (Nothing)</div>
+              <div v-else-if="hasSpun && !globalSpinning" class="text-h6 text-grey-7">Try again!</div>
+              <div v-else class="text-h6 text-grey-7">Try your luck until you are connected!</div>
+            </div>
+
+            <q-btn
+              size="lg" color="light-green"
+              :label="globalSpinning ? 'SPINNING...' : 'SPIN'"
+              :loading="globalSpinning"
+              @click="spin" class="full-width" rounded
+            />
+          </q-card>
+        </transition>
+      </q-page>
+    </q-page-container>
+  </q-layout>
+</template>
+
+<style scoped>
+.slot-machine-card { width: 100%; max-width: 400px; border: 4px solid #2c3e50; border-radius: 20px; }
+
+.reel-container {
+  background: white;
+  width: 80px;
+  height: 100px;
+  position: relative;
+  overflow: hidden;
+  border-radius: 8px;
+  border: 2px solid #ddd;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.reel-strip {
+  display: flex;
+  flex-direction: column;
+  position: absolute;
+  top: 0;
+  animation: move-strip 0.3s linear infinite;
+  filter: blur(2px);
+}
+
+@keyframes move-strip {
+  0% { transform: translateY(-50%); }
+  100% { transform: translateY(0); }
+}
+
+.static-symbol {
+  animation: land 0.2s ease-out;
+}
+
+@keyframes land {
+  0% { transform: translateY(-40px); opacity: 0; }
+  70% { transform: translateY(10px); }
+  100% { transform: translateY(0); opacity: 1; }
+}
+
+.animate-bounce { animation: bounce 0.5s infinite alternate; }
+@keyframes bounce { from { transform: scale(1); } to { transform: scale(1.1); } }
+
+.glow-fire {
+  border-color: #ff9800;
+  box-shadow:
+    0 0 10px 2px rgba(255, 152, 0, 0.8),
+    0 0 18px 6px rgba(255, 87, 34, 0.5),
+    inset 0 0 8px 2px rgba(255, 193, 7, 0.4);
+  animation: fireGlow 900ms ease-in-out infinite alternate;
+}
+
+@keyframes fireGlow {
+  0% {
+    box-shadow:
+      0 0 6px 1px rgba(255, 152, 0, 0.6),
+      0 0 12px 3px rgba(255, 87, 34, 0.35),
+      inset 0 0 5px 1px rgba(255, 193, 7, 0.3);
+    transform: translateY(0) scale(1);
+  }
+  100% {
+    box-shadow:
+      0 0 14px 3px rgba(255, 152, 0, 1),
+      0 0 24px 8px rgba(255, 87, 34, 0.6),
+      inset 0 0 10px 3px rgba(255, 193, 7, 0.5);
+    transform: translateY(-1px) scale(1.02);
+  }
+}
+
+.blink-win {
+  animation: blinkWin 300ms steps(1, end) infinite;
+}
+
+@keyframes blinkWin {
+  0% { opacity: 1; filter: drop-shadow(0 0 0 rgba(255,255,255,0)); }
+  50% { opacity: 0.2; filter: drop-shadow(0 0 6px rgba(255,255,255,0.6)); }
+  100% { opacity: 1; filter: drop-shadow(0 0 0 rgba(255,255,255,0)); }
+}
+</style>
--- a/src/views/RegisterView.vue
+++ b/src/views/RegisterView.vue
@@ -0,0 +1,516 @@
+<template>
+  <div class="register-container">
+    <div class="register-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>
+
+      <div class="content-section">
+        <h1 class="title">Create Account</h1>
+        <p class="subtitle">Join the ultimate card game experience</p>
+
+        <q-form @submit.prevent="onSubmit" class="form-section">
+          <q-input
+            v-model="username"
+            label="Username"
+            filled
+            color="primary"
+            label-color="grey-6"
+            :error="!!errorMessage"
+            :error-message="errorMessage"
+            class="form-input"
+            lazy-rules
+            :rules="[
+              val => !!val && val.trim().length > 0 || 'Username is required',
+              val => val && val.trim().length >= 3 || 'Username must be at least 3 characters',
+              val => val && val.trim().length <= 30 || 'Username must be less than 30 characters',
+              val => /^[a-zA-Z0-9_-]+$/.test(val) || 'Username can only contain letters, numbers, underscores, and hyphens'
+            ]"
+          >
+            <template v-slot:prepend>
+              <q-icon name="person" color="grey-6" />
+            </template>
+          </q-input>
+
+          <q-input
+            v-model="password"
+            label="Password"
+            filled
+            type="password"
+            color="primary"
+            label-color="grey-6"
+            :error="!!errorMessage"
+            :error-message="errorMessage"
+            class="form-input"
+            lazy-rules
+            :rules="[
+              val => !!val || 'Password is required',
+              val => val && val.length >= 6 || 'Password must be at least 6 characters'
+            ]"
+          >
+            <template v-slot:prepend>
+              <q-icon name="lock" color="grey-6" />
+            </template>
+          </q-input>
+
+          <q-input
+            v-model="confirmPassword"
+            label="Confirm Password"
+            filled
+            type="password"
+            color="primary"
+            label-color="grey-6"
+            :error="!!errorMessage"
+            :error-message="errorMessage"
+            class="form-input"
+            lazy-rules
+            :rules="[
+              val => !!val || 'Password confirmation is required',
+              val => val === password || 'Passwords do not match'
+            ]"
+          >
+            <template v-slot:prepend>
+              <q-icon name="lock_outline" color="grey-6" />
+            </template>
+          </q-input>
+
+          <div class="action-buttons">
+            <q-btn
+              type="submit"
+              label="Create Account"
+              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 register 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="login-link">
+          <span class="login-text">Already have an account?</span>
+          <q-btn
+            flat
+            color="primary"
+            label="Login"
+            @click="goToLogin"
+            class="login-btn"
+            size="md"
+            dense
+          />
+        </div>
+      </div>
+    </div>
+    <vue-particles
+      id="particles-js"
+      :options='options'
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { useQuasar } from 'quasar'
+import { ref } from 'vue'
+import axios from "axios"
+import router from "@/router"
+
+const api = window?.__RUNTIME_CONFIG__?.API_URL
+const $q = useQuasar()
+
+const username = ref('')
+const password = ref('')
+const confirmPassword = ref('')
+const inProgress = ref(false)
+const errorMessage = ref('')
+
+const onSubmit = async () => {
+  if (inProgress.value) return
+
+  inProgress.value = true
+  errorMessage.value = ''
+
+  try {
+    const response = await axios.post(`${api}/register`, {
+      username: username.value.trim(),
+      password: password.value
+    })
+
+    if (response.status === 201) {
+      $q.notify({
+        type: 'positive',
+        message: 'Registration successful! Please login.',
+        position: 'top'
+      })
+      router.push('/login')
+    }
+  } catch (error: any) {
+    if (error.response?.status === 409) {
+      errorMessage.value = 'Username already taken'
+    } else if (error.response?.status === 400) {
+      errorMessage.value = error.response.data?.message || 'Invalid input'
+    } else {
+      errorMessage.value = 'Registration failed. Please try again.'
+    }
+  } finally {
+    inProgress.value = false
+  }
+}
+
+const goToLogin = () => {
+  router.push('/login')
+}
+
+const loginWithProvider = (provider: string) => {
+  window.location.href = `${api}/auth/${provider}`
+}
+
+const options = {
+  "particles": {
+    "number": {
+      "value": 80,
+      "density": {
+        "enable": true,
+        "area": 800
+      }
+    },
+    "color": {
+      "value": "#ffffff"
+    },
+    "shape": {
+      "type": "circle",
+      "stroke": {
+        "width": 0,
+        "color": "#000000"
+      },
+      "polygon": {
+        "sides": 5
+      }
+    },
+    "opacity": {
+      "value": 0.5,
+      "random": false,
+      "animation": {
+        "enable": false,
+        "speed": 1,
+        "minimumValue": 0.1,
+        "sync": false
+      }
+    },
+    "size": {
+      "value": 3,
+      "random": true,
+      "animation": {
+        "enable": false,
+        "speed": 40,
+        "minimumValue": 0.1,
+        "sync": false
+      }
+    },
+    "links": {
+      "enable": true,
+      "distance": 150,
+      "color": "#ffffff",
+      "opacity": 0.4,
+      "width": 1
+    },
+    "move": {
+      "enable": true,
+      "speed": 1,
+      "direction": "none",
+      "random": false,
+      "straight": false,
+      "outModes": {
+        "default": "out"
+      },
+      "attract": {
+        "enable": false,
+        "rotate": {
+          "x": 600,
+          "y": 1200
+        }
+      }
+    }
+  },
+  "interactivity": {
+    "detectsOn": "canvas",
+    "events": {
+      "onHover": {
+        "enable": false,
+        "mode": "repulse"
+      },
+      "onClick": {
+        "enable": false,
+        "mode": "push"
+      },
+      "resize": true
+    },
+    "modes": {
+      "grab": {
+        "distance": 400,
+        "links": {
+          "opacity": 1
+        }
+      },
+      "bubble": {
+        "distance": 400,
+        "size": 40,
+        "duration": 2,
+        "opacity": 8,
+        "speed": 3
+      },
+      "repulse": {
+        "distance": 200,
+        "duration": 0.4
+      },
+      "push": {
+        "quantity": 4
+      },
+      "remove": {
+        "quantity": 2
+      }
+    }
+  },
+  "detectRetina": true
+}
+</script>
+
+<style scoped>
+.register-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  padding: 1rem;
+  box-sizing: border-box;
+}
+
+.register-box {
+  width: 100%;
+  max-width: 420px;
+  max-height: calc(100vh - 1rem);
+  background: var(--color-background-soft);
+  backdrop-filter: blur(20px);
+  border-radius: 24px;
+  box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
+  overflow-y: auto;
+  overflow-x: hidden;
+  z-index: 2;
+  border: 1px solid var(--color-border);
+  box-sizing: border-box;
+}
+
+.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;
+  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;
+  color: white;
+}
+
+.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);
+}
+
+.social-icon {
+  margin-right: 0.5rem;
+}
+
+.social-text {
+  font-weight: 500;
+}
+
+.login-link {
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+}
+
+.login-text {
+  color: var(--color-text);
+  font-size: 0.9rem;
+  opacity: 0.7;
+}
+
+#particles-js {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+}
+
+@media (max-width: 600px) {
+  .register-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/UsernameSelectionView.vue
+++ b/src/views/UsernameSelectionView.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="username-selection-container">
+    <div class="username-selection-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>
+
+      <div class="content-section">
+        <h1 class="title">Choose Your Username</h1>
+        <p class="subtitle">
+          You're signed in with <span class="provider-badge">{{ userInfo.providerName }}</span>. Please choose a username for your account.
+        </p>
+
+        <div class="user-info-card">
+          <div class="user-avatar">
+            <img v-if="userInfo.picture" :src="userInfo.picture" alt="Profile" class="avatar-img" />
+            <div v-else class="avatar-text">{{ userInfo.name?.charAt(0)?.toUpperCase() || 'U' }}</div>
+          </div>
+          <div class="user-details">
+            <div class="user-name">{{ userInfo.name || 'Unknown User' }}</div>
+            <div class="user-provider">Signed in with {{ userInfo.providerName }}</div>
+          </div>
+        </div>
+
+        <q-form @submit.prevent="onSubmit" class="form-section">
+          <q-input
+            v-model="username"
+            label="Username"
+            filled
+            dark
+            color="primary"
+            label-color="grey-6"
+            :error="!!errorMessage"
+            :error-message="errorMessage"
+            :loading="inProgress"
+            class="username-input"
+            lazy-rules
+            :rules="[
+              val => !!val && val.trim().length > 0 || 'Username is required',
+              val => val && val.trim().length >= 3 || 'Username must be at least 3 characters',
+              val => val && val.trim().length <= 30 || 'Username must be less than 30 characters',
+              val => /^[a-zA-Z0-9_-]+$/.test(val) || 'Username can only contain letters, numbers, underscores, and hyphens'
+            ]"
+          >
+            <template v-slot:prepend>
+              <q-icon name="person" color="grey-6" />
+            </template>
+          </q-input>
+
+          <div class="action-buttons">
+            <q-btn
+              type="submit"
+              label="Complete Registration"
+              color="primary"
+              class="submit-btn"
+              :loading="inProgress"
+              size="md"
+              rounded
+            />
+            <q-btn
+              flat
+              color="grey-6"
+              label="Cancel"
+              @click="goToLogin"
+              class="cancel-btn"
+              size="md"
+            />
+          </div>
+        </q-form>
+      </div>
+    </div>
+    <vue-particles
+      id="particles-js"
+      :options='options'
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { useQuasar } from 'quasar'
+import { ref, onMounted } from 'vue'
+import axios from "axios"
+import router from "@/router"
+import { useUserInfo } from "@/composables/useUserInfo"
+
+const api = window?.__RUNTIME_CONFIG__?.API_URL
+const $q = useQuasar()
+const uInfo = useUserInfo()
+
+const username = ref('')
+const inProgress = ref(false)
+const errorMessage = ref('')
+const userInfo = ref({
+  id: '',
+  email: '',
+  name: '',
+  picture: '',
+  provider: '',
+  providerName: ''
+})
+
+onMounted(async () => {
+  // Get user info from session storage or API
+  try {
+    const response = await axios.get(`${api}/select-username`, { withCredentials: true })
+    userInfo.value = response.data
+  } catch (error) {
+    console.error('Failed to get user info:', error)
+    router.push('/login')
+  }
+})
+
+const onSubmit = async () => {
+  if (inProgress.value) return
+
+  inProgress.value = true
+  errorMessage.value = ''
+
+  try {
+    const response = await axios.post(`${api}/submit-username`, {
+      username: username.value.trim()
+    }, { withCredentials: true })
+
+    if (response.status === 200) {
+      // User successfully created and logged in
+      await uInfo.requestState()
+      router.push('/')
+    }
+  } catch (error: any) {
+    if (error.response?.status === 409) {
+      errorMessage.value = 'Username already taken'
+    } else if (error.response?.status === 400) {
+      errorMessage.value = error.response.data?.message || 'Invalid username'
+    } else {
+      errorMessage.value = 'Registration failed. Please try again.'
+    }
+  } finally {
+    inProgress.value = false
+  }
+}
+
+const goToLogin = () => {
+  router.push('/login')
+}
+
+const options = {
+  "particles": {
+    "number": {
+      "value": 80,
+      "density": {
+        "enable": true,
+        "area": 800
+      }
+    },
+    "color": {
+      "value": "#ffffff"
+    },
+    "shape": {
+      "type": "circle",
+      "stroke": {
+        "width": 0,
+        "color": "#000000"
+      },
+      "polygon": {
+        "sides": 5
+      }
+    },
+    "opacity": {
+      "value": 0.5,
+      "random": false,
+      "animation": {
+        "enable": false,
+        "speed": 1,
+        "minimumValue": 0.1,
+        "sync": false
+      }
+    },
+    "size": {
+      "value": 3,
+      "random": true,
+      "animation": {
+        "enable": false,
+        "speed": 40,
+        "minimumValue": 0.1,
+        "sync": false
+      }
+    },
+    "links": {
+      "enable": true,
+      "distance": 150,
+      "color": "#ffffff",
+      "opacity": 0.4,
+      "width": 1
+    },
+    "move": {
+      "enable": true,
+      "speed": 1,
+      "direction": "none",
+      "random": false,
+      "straight": false,
+      "outModes": {
+        "default": "out"
+      },
+      "attract": {
+        "enable": false,
+        "rotate": {
+          "x": 600,
+          "y": 1200
+        }
+      }
+    }
+  },
+  "interactivity": {
+    "detectsOn": "canvas",
+    "events": {
+      "onHover": {
+        "enable": false,
+        "mode": "repulse"
+      },
+      "onClick": {
+        "enable": false,
+        "mode": "push"
+      },
+      "resize": true
+    },
+    "modes": {
+      "grab": {
+        "distance": 400,
+        "links": {
+          "opacity": 1
+        }
+      },
+      "bubble": {
+        "distance": 400,
+        "size": 40,
+        "duration": 2,
+        "opacity": 8,
+        "speed": 3
+      },
+      "repulse": {
+        "distance": 200,
+        "duration": 0.4
+      },
+      "push": {
+        "quantity": 4
+      },
+      "remove": {
+        "quantity": 2
+      }
+    }
+  },
+  "detectRetina": true
+}
+</script>
+
+<style scoped>
+.username-selection-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  padding: 3rem;
+  box-sizing: border-box;
+}
+
+.username-selection-box {
+  width: 100%;
+  max-width: 420px;
+  height: 100%;
+  max-height: calc(100vh - 1rem);
+  background: var(--color-background-soft);
+  backdrop-filter: blur(20px);
+  border-radius: 24px;
+  box-shadow: 0 10px 10px rgba(0, 0, 0, 0.5);
+  overflow-y: auto;
+  overflow-x: hidden;
+  z-index: 2;
+  border: 1px solid var(--color-border);
+  box-sizing: border-box;
+}
+
+.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;
+}
+
+.provider-badge {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 0.2rem 0.6rem;
+  border-radius: 12px;
+  font-size: 0.85rem;
+  font-weight: 600;
+}
+
+.user-info-card {
+  background: var(--color-background-mute);
+  border-radius: 16px;
+  padding: 1.5rem;
+  margin-bottom: 2rem;
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  border: 1px solid var(--color-border);
+}
+
+.user-avatar {
+  width: 60px;
+  height: 60px;
+  border-radius: 50%;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  flex-shrink: 0;
+}
+
+.avatar-img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.avatar-text {
+  color: white;
+  font-weight: 700;
+  font-size: 1.4rem;
+}
+
+.user-details {
+  flex: 1;
+}
+
+.user-name {
+  color: var(--color-heading);
+  font-weight: 600;
+  font-size: 1.1rem;
+  margin-bottom: 0.25rem;
+}
+
+.user-provider {
+  color: var(--color-text);
+  font-size: 0.9rem;
+  opacity: 0.7;
+}
+
+.form-section {
+  display: flex;
+  flex-direction: column;
+  gap: 1.5rem;
+}
+
+.username-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;
+}
+
+.cancel-btn {
+  width: 100%;
+  height: 48px;
+  font-weight: 500;
+  color: var(--color-text);
+  opacity: 0.7;
+}
+
+.cancel-btn:hover {
+  opacity: 1;
+}
+
+#particles-js {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+}
+
+@media (max-width: 600px) {
+  .username-selection-box {
+    max-width: 100%;
+    border-radius: 16px;
+    max-height: calc(100vh - 1rem);
+  }
+
+  .content-section {
+    padding: 1rem;
+  }
+
+  .title {
+    font-size: 1.5rem;
+  }
+}
+</style>
--- a/versions.env
+++ b/versions.env
@@ -1,3 +1,3 @@
 MAJOR=0
-MINOR=12
+MINOR=24
 PATCH=0
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,18 +1,57 @@
 import { fileURLToPath, URL } from 'node:url'
-
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import { quasar, transformAssetUrls } from '@quasar/vite-plugin'
 import vueJsx from '@vitejs/plugin-vue-jsx'
 import vueDevTools from 'vite-plugin-vue-devtools'
+import { quasar, transformAssetUrls } from '@quasar/vite-plugin'
+import { VitePWA } from 'vite-plugin-pwa'

 // https://vite.dev/config/
 export default defineConfig({
  plugins: [
-    vue({ template: { transformAssetUrls } }),
+    vue({
+      template: { transformAssetUrls }
+    }),
    vueJsx(),
    vueDevTools(),
    quasar(),
+    VitePWA({
+      registerType: 'autoUpdate',
+      workbox: {
+        globDirectory: 'dist/',
+        globPatterns: [
+          '**/*.{js,css,html,ico,png,svg,webmanifest}',
+        ],
+        navigateFallbackDenylist: [
+          /^\/api/,
+        ],
+      },
+
+      manifest: {
+        name: 'Knockout Whist PWA',
+        short_name: 'Whist PWA',
+        description: 'The Knockout Whist card game as a Progressive Web App.',
+        theme_color: '#4A4A4A',
+        background_color: '#ffffff',
+        display: 'standalone',
+        icons: [
+          {
+            src: 'logo192.png',
+            sizes: '192x192',
+            type: 'image/png'
+          },
+          {
+            src: 'logo512.png',
+            sizes: '512x512',
+            type: 'image/png'
+          }
+        ]
+      },
+      devOptions: {
+        enabled: true,
+        type: 'module',
+      }
+    })
  ],
  resolve: {
    alias: {
Author	SHA1	Message	Date
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