ci: bump version to v4.0.1

ci: bump version to v4.0.0
feat(websocket)!: Implement WebSocket connection and event handling (#82 )
2025-11-24 11:21:05 +00:00 · 2025-11-23 15:15:09 +00:00 · 2025-11-23 16:11:46 +01:00 · 2025-11-22 20:38:51 +00:00 · 2025-11-22 21:36:23 +01:00 · 2025-11-20 15:31:03 +00:00
48 changed files with 3515 additions and 2233 deletions
--- a/.sbtopts
+++ b/.sbtopts
@@ -1,2 +1,2 @@
 -J--add-opens=java.base/java.util=ALL-UNNAMED
-J--add-opens=java.base/java.lang=ALL-UNNAMED
+-J--add-opens=java.base/java.lang=ALL-UNNAMED
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,3 +105,41 @@
 ### Bug Fixes

 * trailing ([7adc8b8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7adc8b8645390cd18d63b4eee6db8ef448b7a46a))
+##  (2025-11-07)
+
+### Bug Fixes
+
+* removed trailing ([c7dd72e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c7dd72ecc2786ef63daf2b4288093025a8e22bfd))
+* removed trailing ([42a5adb](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/42a5adbae01802587a48a9de15bad44b5ef014cf))
+##  (2025-11-20)
+
+### ⚠ BREAKING CHANGES
+
+* **game:** Fixed polling, SPA, Gameplayloop etc. (#59)
+
+### Features
+
+* **ci:** Polling ([370de17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/370de175db65edf87e7ab211190977b540a39d85))
+* **ci:** Polling  Added polling for when the game starts and a card gets played ([#58](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/58)) ([e60fe7c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e60fe7c98dcab05949140a8a54ed6e4e2fbbc022))
+* **game:** Fixed polling, SPA, Gameplayloop etc. ([#59](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/59)) ([a58b2e0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/a58b2e03b11a54667d63ba6604f579a8e328c9d1))
+* **ui:** added js routing, updated ingame ui, added tricktable ([#50](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/50)) ([c220e54](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c220e54bb8d87f4f0f37a089bcd993e8df806123)), closes [#43](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/43) [#43](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/43)
+* **ui:** implement tie & trump menu, fixed some critical bugs ([#52](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/52)) ([5d245d0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/5d245d0011a5fb03193514303b45702cd8329224))
+
+### Bug Fixes
+
+* **polling:** Improve polling mechanism and delay handling ([#60](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/60)) ([641c892](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/641c892981649eb85640527cc0fe325ff683fa77))
+##  (2025-11-22)
+
+### Bug Fixes
+
+* **api:** Fixed a bug where the game would reload on game start ([#81](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/81)) ([9738a04](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/9738a04b7a3c63c8cd1450e563ec04823fb3c35a))
+##  (2025-11-23)
+
+### ⚠ BREAKING CHANGES
+
+* **websocket:** Implement WebSocket connection and event handling (#82)
+
+### Features
+
+* **websocket:** Implement WebSocket connection and event handling ([#82](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/82)) ([8ca909d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/8ca909db522dd7108a3e40ce84811eaf8695eaa5))
+##  (2025-11-24)
--- a/build.sbt
+++ b/build.sbt
@@ -1,12 +1,12 @@
 ThisBuild / scalaVersion := "3.5.1"

 lazy val commonSettings = Seq(
-  libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.18",
-  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.18" % "test",
-  libraryDependencies += "io.github.mkpaz" % "atlantafx-base" % "2.0.1",
-  libraryDependencies += "org.scalafx" %% "scalafx" % "22.0.0-R33",
-  libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.3.0",
-  libraryDependencies += "org.playframework" %% "play-json" % "3.1.0-M1",
+  libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.19",
+  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % "test",
+  libraryDependencies += "io.github.mkpaz" % "atlantafx-base" % "2.1.0",
+  libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.2-R36",
+  libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.4.0",
+  libraryDependencies += "org.playframework" %% "play-json" % "3.1.0-M9",
  libraryDependencies ++= {
    // Determine OS version of JavaFX binaries
    lazy val osName = System.getProperty("os.name") match {
@@ -38,8 +38,9 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb"))
    commonSettings,
    libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.2" % Test,
    libraryDependencies += "de.mkammerer" % "argon2-jvm" % "2.12",
-    libraryDependencies += "com.auth0" % "java-jwt" % "4.3.0",
-    libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.2",
+    libraryDependencies += "com.auth0" % "java-jwt" % "4.5.0",
+    libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.3",
+    libraryDependencies += "tools.jackson.module" %% "jackson-module-scala" % "3.0.2",
    JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
  )

--- a/conventionalcommit.json
+++ b/conventionalcommit.json
@@ -113,4 +113,4 @@
      "description": "The commit references another commit by its hash ID.<br>For multiple hash IDs, use a comma as separator"
    }
  }
-}
+}
--- a/2
+++ b/2
--- a/knockoutwhistweb/app/assets/stylesheets/dark-mode.less
+++ b/knockoutwhistweb/app/assets/stylesheets/dark-mode.less
@@ -3,7 +3,7 @@
    --background-image: url('/assets/images/background.png') !important;
    --color: #f8f9fa !important; /* Light text on dark bg */
    --highlightscolor: rgba(131, 131, 131, 0.75) !important;
-
+    --background-color: #192734;
    /* Bootstrap variable overrides for dark mode */
    --bs-body-color: var(--color);
    --bs-link-color: #66b2ff;
--- a/knockoutwhistweb/app/assets/stylesheets/light-mode.less
+++ b/knockoutwhistweb/app/assets/stylesheets/light-mode.less
@@ -2,4 +2,5 @@
  --background-image: url('/assets/images/img.png');
  --color: black;
  --highlightscolor: rgba(0, 0, 0, 0.75);
+  --background-color: rgba(228, 232, 237, 1);
 }
--- a/knockoutwhistweb/app/assets/stylesheets/login.less
+++ b/knockoutwhistweb/app/assets/stylesheets/login.less
@@ -17,7 +17,7 @@
  width: 100%;
  border: none;
  border-radius: 1rem;
-  box-shadow: 0 4px 20px rgba(0,0,0,0.1);
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
  position: relative;
  z-index: 3; /* ensure card sits above the particles */
 }
--- a/knockoutwhistweb/app/assets/stylesheets/main.less
+++ b/knockoutwhistweb/app/assets/stylesheets/main.less
@@ -15,194 +15,286 @@
  --bs-heading-color: var(--color) !important;
 }

+@background-color: var(--background-color);
@highlightcolor: var(--highlightscolor);
@background-image: var(--background-image);
@color: var(--color);
@keyframes slideIn {
-  0% { transform: translateX(-100vw); }
-  100% { transform: translateX(0); }
-}
-.game-field-background {
-    background-image: @background-image;
-    background-size: cover;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-attachment: fixed;
+  0% {
+    transform: translateX(-100vw);
+  }
+  100% {
+    transform: translateX(0);
+  }
 }

-.navbar-header{
-    text-align:center;
+.game-field-background {
+  background-image: @background-image;
+  background-repeat: no-repeat;
+  background-size: cover;
+  max-width: 1400px;
+  margin: 0 auto;
+  min-height: 100vh;
+}
+
+.lobby-background {
+  background-color: @background-color;
+  width: 100%;
+  height: 100vh;
+}
+
+.navbar-header {
+  text-align: center;
 }

 .navbar-toggle {
-    float: none;
-    margin-right:0;
+  float: none;
+  margin-right: 0;
 }
+
 .handcard :hover {
  box-shadow: 3px 3px 3px @highlightcolor;
 }

+.inactive::after {
+  content: "";
+  position: absolute;
+  inset: 0; /* cover the whole container */
+  background: rgba(0, 0, 0, 0.50);
+  z-index: 10;
+  border-radius: 6px;
+  pointer-events: none; /* user can't click through overlay */
+}
+
 .bottom-div {
  position: fixed;
  bottom: 0;
-  left: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  max-width: 1400px;
  width: 100%;
+  margin: 0;
  text-align: center;
  padding: 10px;
 }

 /* Ensure body text color follows theme variable and works with Bootstrap */
 body {
-    color: @color;
+  color: @color;
 }

 .footer {
-    width: 100%;
-    text-align: center;
-    font-size: 12px;
-    color: @color;
-    padding: 0.5rem 0;
-    flex-grow: 1; /* fill remaining vertical space as visual footer background */
+  width: 100%;
+  text-align: center;
+  font-size: 12px;
+  color: @color;
+  padding: 0.5rem 0;
+  flex-grow: 1; /* fill remaining vertical space as visual footer background */
 }

 .game-field {
-    position: fixed;
-    inset: 0;
-    overflow: auto;
+  position: fixed;
+  inset: 0;
+  overflow: auto;
+}
+
+.navbar-drop-shadow {
+  box-shadow: 0 1px 15px 0 #000000
+}
+
+.ingame-side-shadow {
+  box-shadow: 0 1px 15px 0 #000000
 }

 #sessions {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: center;
-    text-align: center;
-    h1 {
-        animation: slideIn 0.5s ease-out forwards;
-        animation-fill-mode: backwards;
-    }
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  text-align: center;
+
+  h1 {
+    animation: slideIn 0.5s ease-out forwards;
+    animation-fill-mode: backwards;
+  }
 }
+
 #textanimation {
-        animation: slideIn 0.5s ease-out forwards;
-        animation-fill-mode: backwards;
-        animation-delay: 1s;
+  animation: slideIn 0.5s ease-out forwards;
+  animation-fill-mode: backwards;
+  animation-delay: 1s;
 }

 #sessions a, #sessions h1, #sessions p {
-    color: @color;
-    font-size: 40px;
-    font-family: Arial, serif;
+  color: @color;
+  font-size: 40px;
+  font-family: Arial, serif;
 }
+
 #ingame {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: flex-end;
-    height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-end;
+  height: 100%;
 }
+
 #ingame a, #ingame h1, #ingame p {
-    color: @color;
-    font-size: 40px;
-    font-family: Arial, serif;
+  color: @color;
+  font-size: 40px;
+  font-family: Arial, serif;
 }
-#playercards {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    height: 20%;
-    img {
-        animation: slideIn 0.5s ease-out forwards;
-        animation-fill-mode: backwards;
-        &:nth-child(1) { animation-delay: 0.5s; }
-        &:nth-child(2) { animation-delay: 1s; }
-        &:nth-child(3) { animation-delay: 1.5s; }
-        &:nth-child(4) { animation-delay: 2s; }
-        &:nth-child(5) { animation-delay: 2.5s; }
-        &:nth-child(6) { animation-delay: 3s; }
-        &:nth-child(7) { animation-delay: 3.5s; }
-    }
-}
-#card-slide {
-    div {
-        animation: slideIn 0.5s ease-out forwards;
-        animation-fill-mode: backwards;
-        &:nth-child(1) { animation-delay: 0.5s; }
-        &:nth-child(2) { animation-delay: 1s; }
-        &:nth-child(3) { animation-delay: 1.5s; }
-        &:nth-child(4) { animation-delay: 2s; }
-        &:nth-child(5) { animation-delay: 2.5s; }
-        &:nth-child(6) { animation-delay: 3s; }
-        &:nth-child(7) { animation-delay: 3.5s; }
+
+.ingame-cards-slide {
+  div {
+    animation: slideIn 0.5s ease-out forwards;
+    animation-fill-mode: backwards;
+
+    &:nth-child(1) {
+      animation-delay: 0.5s;
    }

+    &:nth-child(2) {
+      animation-delay: 1s;
+    }

+    &:nth-child(3) {
+      animation-delay: 1.5s;
+    }
+
+    &:nth-child(4) {
+      animation-delay: 2s;
+    }
+
+    &:nth-child(5) {
+      animation-delay: 2.5s;
+    }
+
+    &:nth-child(6) {
+      animation-delay: 3s;
+    }
+
+    &:nth-child(7) {
+      animation-delay: 3.5s;
+    }
+  }
 }

-#cardsplayed {
-    display: flex;
-    flex-direction: row;
-    height: 10%;
-    min-height: 10%
-}
 #playedcardplayer {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
 }
+
 #playedcardplayer p {
-    font-size: 12px;
-    height: 4%;
+  font-size: 12px;
+  height: 4%;
 }
+
 #playedcardplayer img {
-    height: 90%;
+  height: 90%;
 }

 #firstCard {
-    display: flex;
-    flex-direction: row;
-    height: 20%;
-    width: 100%;
-    justify-content: space-between;
+  display: flex;
+  flex-direction: row;
+  height: 20%;
+  width: 100%;
+  justify-content: space-between;
 }
+
 #firstCardObject {
-    display: flex;
-    flex-direction: column;
-    margin-right: 4%;
+  display: flex;
+  flex-direction: column;
+  margin-right: 4%;
 }
-#firstCardObject img{
-    height: 90%;
+
+#firstCardObject img {
+  height: 90%;
 }
-#firstCardObject p{
-    height: 10%;
-    font-size: 20px;
+
+#firstCardObject p {
+  height: 10%;
+  font-size: 20px;

 }
-#trumpsuit {
-    display: flex;
-    flex-direction: row;
-    margin-left: 4%;
-}
+
 #nextPlayers {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    height: 0;
-    p {
-        margin-top: 0;
-        margin-bottom: 0;
-    }
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: 0;
+
+  p {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
 }
+
 #invisible {
-    visibility: hidden;
+  visibility: hidden;
 }
+
 #selecttrumpsuit {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: 100%;
 }
+
 #rules {
-    color: @color;
-    font-size: 1.5em;
-    font-family: Arial, serif;
-}
+  color: @color;
+  font-size: 1.5em;
+  font-family: Arial, serif;
+}
+
+.score-table {
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 8px;
+  padding: 10px;
+  margin-bottom: 20px;
+  backdrop-filter: blur(8px);
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+.score-header {
+  font-weight: bold;
+  color: #000000;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+}
+
+.score-row {
+  color: #000000;
+}
+
+/* In-game centered stage and blurred sides overlay */
+.ingame-stage {
+  min-height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2rem 1rem;
+}
+
+/* Wrapper that adds a backdrop blur to the background outside the centered card */
+.blur-sides {
+  position: relative;
+}
+
+/* Create an overlay that blurs everything behind it, except the central content area */
+.blur-sides::before {
+  content: "";
+  position: fixed;
+  inset: 0;
+  pointer-events: none;
+  /* fallback: subtle vignette if backdrop-filter unsupported */
+  background: radial-gradient(ellipse at center, rgba(0, 0, 0, 0) 30%, rgba(0, 0, 0, 0.35) 100%);
+}
+
+@supports ((-webkit-backdrop-filter: blur(8px)) or (backdrop-filter: blur(8px))) {
+  .blur-sides::before {
+    background: rgba(0, 0, 0, 0.08);
+    -webkit-backdrop-filter: blur(10px) saturate(110%);
+    backdrop-filter: blur(10px) saturate(110%);
+  }
+}
--- a/knockoutwhistweb/app/auth/AuthAction.scala
+++ b/knockoutwhistweb/app/auth/AuthAction.scala
@@ -15,13 +15,6 @@ class AuthAction @Inject()(val sessionManager: SessionManager, val parser: BodyP

  override def executionContext: ExecutionContext = ec

-  protected def getUserFromSession(request: RequestHeader): Option[User] = {
-    val session = request.cookies.get("sessionId")
-    if (session.isDefined)
-      return sessionManager.getUserBySession(session.get.value)
-    None
-  }
-  
  override def invokeBlock[A](
                               request: Request[A],
                               block: AuthenticatedRequest[A] => Future[Result]
@@ -33,5 +26,12 @@ class AuthAction @Inject()(val sessionManager: SessionManager, val parser: BodyP
        Future.successful(Results.Redirect(routes.UserController.login()))
    }
  }
+
+  protected def getUserFromSession(request: RequestHeader): Option[User] = {
+    val session = request.cookies.get("sessionId")
+    if (session.isDefined)
+      return sessionManager.getUserBySession(session.get.value)
+    None
+  }
 }

--- a/knockoutwhistweb/app/components/WebApplicationConfiguration.scala
+++ b/knockoutwhistweb/app/components/WebApplicationConfiguration.scala
@@ -2,11 +2,13 @@ package components

 import de.knockoutwhist.components.DefaultConfiguration
 import de.knockoutwhist.ui.UI
+import de.knockoutwhist.utils.DelayHandler
 import de.knockoutwhist.utils.events.EventListener

 class WebApplicationConfiguration extends DefaultConfiguration {

  override def uis: Set[UI] = Set()
-  override def listener: Set[EventListener] = Set()
+
+  override def listener: Set[EventListener] = Set(DelayHandler)

 }
--- a/knockoutwhistweb/app/controllers/IngameController.scala
+++ b/knockoutwhistweb/app/controllers/IngameController.scala
@@ -1,60 +1,76 @@
 package controllers

 import auth.{AuthAction, AuthenticatedRequest}
-import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak}
-import exceptions.{CantPlayCardException, GameFullException, NotEnoughPlayersException, NotHostException, NotInThisGameException}
+import de.knockoutwhist.control.GameState.*
+import exceptions.*
 import logic.PodManager
-import model.sessions.{PlayerSession, UserSession}
+import logic.game.GameLobby
+import model.sessions.UserSession
+import model.users.User
 import play.api.*
+import play.api.libs.json.{JsValue, Json}
 import play.api.mvc.*
+import play.twirl.api.Html

 import java.util.UUID
 import javax.inject.*
+import scala.concurrent.ExecutionContext
 import scala.util.Try

-
-/**
- * This controller creates an `Action` to handle HTTP requests to the
- * application's home page.
- */
@Singleton
 class IngameController @Inject()(
-                                  val controllerComponents: ControllerComponents,
+                                  val cc: ControllerComponents,
                                  val authAction: AuthAction,
-                                  val podManager: PodManager
-                                ) extends BaseController {
+                                  implicit val ec: ExecutionContext
+                                ) extends AbstractController(cc) {

  def game(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = podManager.getGame(gameId)
+    val game = PodManager.getGame(gameId)
    game match {
      case Some(g) =>
-        g.logic.getCurrentState match {
-          case Lobby => Ok(views.html.lobby.lobby(Some(request.user), g))
-          case InGame =>
-            Ok(views.html.ingame.ingame(
-              g.getPlayerByUser(request.user),
-              g
-            ))
-          case SelectTrump =>
-            Ok(views.html.ingame.selecttrump(
-              g.getPlayerByUser(request.user),
-              g.logic
-            ))
-          case TieBreak =>
-            Ok(views.html.ingame.tie(
-              g.getPlayerByUser(request.user),
-              g.logic
-            ))
-          case _ =>
-            InternalServerError(s"Invalid game state for in-game view. GameId: $gameId" + s" State: ${g.logic.getCurrentState}")
+        val results = Try {
+          returnInnerHTML(g, request.user)
+        }
+        if (results.isSuccess) {
+          Ok(views.html.main("In-Game - Knockout Whist")(results.get))
+        } else {
+          InternalServerError(results.failed.get.getMessage)
        }
      case None =>
-        NotFound("Game not found")
+        Redirect(routes.MainMenuController.mainMenu())
    }
-    //NotFound(s"Reached end of game method unexpectedly. GameId: $gameId")
  }
+
+  def returnInnerHTML(gameLobby: GameLobby, user: User): Html = {
+    gameLobby.logic.getCurrentState match {
+      case Lobby => views.html.lobby.lobby(Some(user), gameLobby)
+      case InGame =>
+        views.html.ingame.ingame(
+          gameLobby.getPlayerByUser(user),
+          gameLobby
+        )
+      case SelectTrump =>
+        views.html.ingame.selecttrump(
+          gameLobby.getPlayerByUser(user),
+          gameLobby
+        )
+      case TieBreak =>
+        views.html.ingame.tie(
+          gameLobby.getPlayerByUser(user),
+          gameLobby
+        )
+      case FinishedMatch =>
+        views.html.ingame.finishedMatch(
+          Some(user),
+          gameLobby
+        )
+      case _ =>
+        throw new IllegalStateException(s"Invalid game state for in-game view. GameId: ${gameLobby.id}" + s" State: ${gameLobby.logic.getCurrentState}")
+    }
+  }
+
  def startGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = podManager.getGame(gameId)
+    val game = PodManager.getGame(gameId)
    val result = Try {
      game match {
        case Some(g) =>
@@ -64,62 +80,84 @@ class IngameController @Inject()(
      }
    }
    if (result.isSuccess) {
-      Redirect(routes.IngameController.game(gameId))
+      Ok(Json.obj(
+        "status" -> "success",
+        "redirectUrl" -> routes.IngameController.game(gameId).url,
+        "content" -> returnInnerHTML(game.get, request.user).toString()
+      ))
    } else {
      val throwable = result.failed.get
      throwable match {
        case _: NotInThisGameException =>
-          BadRequest(throwable.getMessage)
+          BadRequest(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> throwable.getMessage
+          ))
        case _: NotHostException =>
-          Forbidden(throwable.getMessage)
+          Forbidden(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> throwable.getMessage
+          ))
        case _: NotEnoughPlayersException =>
-          BadRequest(throwable.getMessage)
+          BadRequest(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> throwable.getMessage
+          ))
        case _ =>
-          InternalServerError(throwable.getMessage)
+          InternalServerError(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> throwable.getMessage
+          ))
      }
    }
  }
-  def kickPlayer(gameId: String, playerToKick: UUID): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = podManager.getGame(gameId)
-    game.get.leaveGame(playerToKick)
-    Redirect(routes.IngameController.game(gameId))
-  }
-  def leaveGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = podManager.getGame(gameId)
-    game.get.leaveGame(request.user.id)
-    Redirect(routes.MainMenuController.mainMenu())
-  }
-  def joinGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = podManager.getGame(gameId)
+
+  def kickPlayer(gameId: String, playerToKick: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = PodManager.getGame(gameId)
+    val playerToKickUUID = UUID.fromString(playerToKick)
    val result = Try {
-      game match {
-        case Some(g) =>
-          g.addUser(request.user)
-        case None =>
-          NotFound("Game not found")
-      }
+      game.get.leaveGame(playerToKickUUID)
    }
    if (result.isSuccess) {
-      Redirect(routes.IngameController.game(gameId))
+      Ok(Json.obj(
+        "status" -> "success",
+        "redirectUrl" -> routes.IngameController.game(gameId).url
+      ))
    } else {
-      val throwable = result.failed.get
-      throwable match {
-        case _: GameFullException =>
-          BadRequest(throwable.getMessage)
-        case _: IllegalArgumentException =>
-          BadRequest(throwable.getMessage)
-        case _: IllegalStateException =>
-          BadRequest(throwable.getMessage)
-        case _ =>
-          InternalServerError(throwable.getMessage)
-      }
+      InternalServerError(Json.obj(
+        "status" -> "failure",
+        "errorMessage" -> "Something went wrong."
+      ))
    }
  }
+
+  def leaveGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = PodManager.getGame(gameId)
+    val result = Try {
+      game.get.leaveGame(request.user.id)
+    }
+    if (result.isSuccess) {
+      Ok(Json.obj(
+        "status" -> "success",
+        "redirectUrl" -> routes.MainMenuController.mainMenu().url,
+        "content" -> views.html.mainmenu.creategame(Some(request.user)).toString
+      ))
+    } else {
+      InternalServerError(Json.obj(
+        "status" -> "failure",
+        "errorMessage" -> "Something went wrong."
+      ))
+    }
+  }
+
  def playCard(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] => {
-    val game = podManager.getGame(gameId)
+    val game = PodManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
+        val jsonBody = request.body.asJson
+        val cardIdOpt: Option[String] = jsonBody.flatMap { jsValue =>
+          (jsValue \ "cardID").asOpt[String]
+        }
        cardIdOpt match {
          case Some(cardId) =>
            var optSession: Option[UserSession] = None
@@ -131,35 +169,67 @@ class IngameController @Inject()(
            }
            optSession.foreach(_.lock.unlock())
            if (result.isSuccess) {
-              NoContent
+              Ok(Json.obj(
+                "status" -> "success"
+              ))
            } else {
              val throwable = result.failed.get
              throwable match {
                case _: CantPlayCardException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _: NotInThisGameException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _: IllegalArgumentException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _: IllegalStateException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                case _: NotInteractableException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _ =>
-                  InternalServerError(throwable.getMessage)
+                  InternalServerError(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
              }
            }
          case None =>
-            BadRequest("cardId parameter is missing")
+            BadRequest(Json.obj(
+              "status" -> "failure",
+              "errorMessage" -> "cardId Parameter is missing"
+            ))
        }
      case None =>
-        NotFound("Game not found")
+        NotFound(Json.obj(
+          "status" -> "failure",
+          "errorMessage" -> "Game not found"
+        ))
    }
  }
  }
+
  def playDogCard(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] => {
-    val game = podManager.getGame(gameId)
+    val game = PodManager.getGame(gameId)
    game match {
      case Some(g) => {
-        val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
+        val jsonBody = request.body.asJson
+        val cardIdOpt: Option[String] = jsonBody.flatMap { jsValue =>
+          (jsValue \ "cardID").asOpt[String]
+        }
        var optSession: Option[UserSession] = None
        val result = Try {
          cardIdOpt match {
@@ -184,15 +254,30 @@ class IngameController @Inject()(
          val throwable = result.failed.get
          throwable match {
            case _: CantPlayCardException =>
-              BadRequest(throwable.getMessage)
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
            case _: NotInThisGameException =>
-              BadRequest(throwable.getMessage)
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
            case _: IllegalArgumentException =>
-              BadRequest(throwable.getMessage)
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
            case _: IllegalStateException =>
-              BadRequest(throwable.getMessage)
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
            case _ =>
-              InternalServerError(throwable.getMessage)
+              InternalServerError(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
          }
        }
      }
@@ -201,11 +286,15 @@ class IngameController @Inject()(
    }
  }
  }
+
  def playTrump(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = podManager.getGame(gameId)
+    val game = PodManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val trumpOpt = request.body.asFormUrlEncoded.flatMap(_.get("trump").flatMap(_.headOption))
+        val jsonBody = request.body.asJson
+        val trumpOpt: Option[String] = jsonBody.flatMap { jsValue =>
+          (jsValue \ "trump").asOpt[String]
+        }
        trumpOpt match {
          case Some(trump) =>
            var optSession: Option[UserSession] = None
@@ -222,13 +311,25 @@ class IngameController @Inject()(
              val throwable = result.failed.get
              throwable match {
                case _: IllegalArgumentException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _: NotInThisGameException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _: IllegalStateException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _ =>
-                  InternalServerError(throwable.getMessage)
+                  InternalServerError(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
              }
            }
          case None =>
@@ -238,11 +339,15 @@ class IngameController @Inject()(
        NotFound("Game not found")
    }
  }
+
  def playTie(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = podManager.getGame(gameId)
+    val game = PodManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val tieOpt = request.body.asFormUrlEncoded.flatMap(_.get("tie").flatMap(_.headOption))
+        val jsonBody = request.body.asJson
+        val tieOpt: Option[String] = jsonBody.flatMap { jsValue =>
+          (jsValue \ "tie").asOpt[String]
+        }
        tieOpt match {
          case Some(tie) =>
            var optSession: Option[UserSession] = None
@@ -259,13 +364,25 @@ class IngameController @Inject()(
              val throwable = result.failed.get
              throwable match {
                case _: IllegalArgumentException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _: NotInThisGameException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _: IllegalStateException =>
-                  BadRequest(throwable.getMessage)
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
                case _ =>
-                  InternalServerError(throwable.getMessage)
+                  InternalServerError(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
              }
            }
          case None =>
@@ -276,4 +393,46 @@ class IngameController @Inject()(
    }
  }

+
+  def returnToLobby(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = PodManager.getGame(gameId)
+    game match {
+      case Some(g) =>
+        val result = Try {
+          val session = g.getUserSession(request.user.id)
+          g.returnToLobby(session)
+        }
+        if (result.isSuccess) {
+          Ok(Json.obj(
+            "status" -> "success",
+            "redirectUrl" -> routes.IngameController.game(gameId).url
+          ))
+        } else {
+          val throwable = result.failed.get
+          throwable match {
+            case _: NotInThisGameException =>
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+            case _: IllegalStateException =>
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+            case _ =>
+              InternalServerError(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+          }
+        }
+      case None =>
+        NotFound(Json.obj(
+          "status" -> "failure",
+          "errorMessage" -> "Game not found"
+        ))
+    }
+  }
+
 }
--- a/knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala
+++ b/knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala
@@ -0,0 +1,24 @@
+package controllers
+
+import auth.AuthAction
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
+import play.api.routing.JavaScriptReverseRouter
+
+import javax.inject.Inject
+
+class JavaScriptRoutingController @Inject()(
+                                             val controllerComponents: ControllerComponents,
+                                             val authAction: AuthAction,
+                                           ) extends BaseController {
+  def javascriptRoutes(): Action[AnyContent] =
+    Action { implicit request =>
+      Ok(
+        JavaScriptReverseRouter("jsRoutes")(
+          routes.javascript.MainMenuController.createGame,
+          routes.javascript.MainMenuController.joinGame,
+          routes.javascript.MainMenuController.navSPA,
+          routes.javascript.UserController.login_Post
+        )
+      ).as("text/javascript")
+    }
+}
--- a/knockoutwhistweb/app/controllers/MainMenuController.scala
+++ b/knockoutwhistweb/app/controllers/MainMenuController.scala
@@ -3,6 +3,7 @@ package controllers
 import auth.{AuthAction, AuthenticatedRequest}
 import logic.PodManager
 import play.api.*
+import play.api.libs.json.Json
 import play.api.mvc.*

 import javax.inject.*
@@ -16,12 +17,12 @@ import javax.inject.*
 class MainMenuController @Inject()(
                                    val controllerComponents: ControllerComponents,
                                    val authAction: AuthAction,
-                                    val podManager: PodManager
+                                    val ingameController: IngameController
                                  ) extends BaseController {

  // Pass the request-handling function directly to authAction (no nested Action)
  def mainMenu(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    Ok(views.html.mainmenu.creategame(Some(request.user)))
+    Ok(views.html.main("Knockout Whist - Create Game")(views.html.mainmenu.creategame(Some(request.user))))
  }

  def index(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
@@ -29,39 +30,86 @@ class MainMenuController @Inject()(
  }

  def createGame(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val postData = request.body.asFormUrlEncoded
-    if (postData.isDefined) {
-      val gamename = postData.get.get("lobbyname").flatMap(_.headOption).getOrElse(s"${request.user.name}'s Game")
-      val playeramount = postData.get.get("playeramount").flatMap(_.headOption).getOrElse("")
-      val gameLobby = podManager.createGame(
+    val jsonBody = request.body.asJson
+    if (jsonBody.isDefined) {
+      val gamename: String = (jsonBody.get \ "lobbyname").asOpt[String]
+        .getOrElse(s"${request.user.name}'s Game")
+
+      val playeramount: String = (jsonBody.get \ "playeramount").asOpt[String]
+        .getOrElse(throw new IllegalArgumentException("Player amount is required."))
+
+      val gameLobby = PodManager.createGame(
        host = request.user,
        name = gamename,
        maxPlayers = playeramount.toInt
      )
-      Redirect(routes.IngameController.game(gameLobby.id))
+      Ok(Json.obj(
+        "status" -> "success",
+        "redirectUrl" -> routes.IngameController.game(gameLobby.id).url,
+        "content" -> ingameController.returnInnerHTML(gameLobby, request.user).toString
+      ))
    } else {
-      BadRequest("Invalid form submission")
+      BadRequest(Json.obj(
+        "status" -> "failure",
+        "errorMessage" -> "Invalid form submission"
+      ))
    }
-    
+
  }
-  
+
  def joinGame(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val postData = request.body.asFormUrlEncoded
-    if (postData.isDefined) {
-      val gameId = postData.get.get("gameId").flatMap(_.headOption).getOrElse("")
-      val game = podManager.getGame(gameId)
+    val jsonBody = request.body.asJson
+    val gameId: Option[String] = jsonBody.flatMap { jsValue =>
+      (jsValue \ "gameId").asOpt[String]
+    }
+    if (gameId.isDefined) {
+      val game = PodManager.getGame(gameId.get)
      game match {
        case Some(g) =>
-          Redirect(routes.IngameController.joinGame(gameId))
+          g.addUser(request.user)
+          Ok(Json.obj(
+            "status" -> "success",
+            "redirectUrl" -> routes.IngameController.game(g.id).url,
+            "content" -> ingameController.returnInnerHTML(g, request.user).toString
+          ))
        case None =>
-          NotFound("Game not found")
+          NotFound(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> "No Game found"
+          ))
      }
    } else {
-      BadRequest("Invalid form submission")
+      BadRequest(Json.obj(
+        "status" -> "failure",
+        "errorMessage" -> "Invalid form submission"
+      ))
    }
  }

  def rules(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    Ok(views.html.mainmenu.rules(Some(request.user)))
+    Ok(views.html.main("Knockout Whist - Rules")(views.html.mainmenu.rules(Some(request.user))))
  }
+
+  def navSPA(location: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    location match {
+      case "0" => // Main Menu
+        Ok(Json.obj(
+          "status" -> "success",
+          "redirectUrl" -> routes.MainMenuController.mainMenu().url,
+          "content" -> views.html.mainmenu.creategame(Some(request.user)).toString
+        ))
+      case "1" => // Rules
+        Ok(Json.obj(
+          "status" -> "success",
+          "redirectUrl" -> routes.MainMenuController.rules().url,
+          "content" -> views.html.mainmenu.rules(Some(request.user)).toString
+        ))
+      case _ =>
+        BadRequest(Json.obj(
+          "status" -> "failure",
+          "errorMessage" -> "Invalid form submission"
+        ))
+    }
+  }
+
 }
--- a/knockoutwhistweb/app/controllers/UserController.scala
+++ b/knockoutwhistweb/app/controllers/UserController.scala
@@ -3,6 +3,7 @@ package controllers
 import auth.{AuthAction, AuthenticatedRequest}
 import logic.user.{SessionManager, UserManager}
 import play.api.*
+import play.api.libs.json.Json
 import play.api.mvc.*

 import javax.inject.*
@@ -28,28 +29,35 @@ class UserController @Inject()(
        if (possibleUser.isDefined) {
          Redirect(routes.MainMenuController.mainMenu())
        } else {
-          Ok(views.html.login.login())
+          Ok(views.html.main("Login")(views.html.login.login()))
        }
      } else {
-        Ok(views.html.login.login())
+        Ok(views.html.main("Login")(views.html.login.login()))
      }
    }
  }

  def login_Post(): Action[AnyContent] = {
    Action { implicit request =>
-      val postData = request.body.asFormUrlEncoded
-      if (postData.isDefined) {
+      val jsonBody = request.body.asJson
+      val username: Option[String] = jsonBody.flatMap { jsValue =>
+        (jsValue \ "username").asOpt[String]
+      }
+      val password: Option[String] = jsonBody.flatMap { jsValue =>
+        (jsValue \ "password").asOpt[String]
+      }
+      if (username.isDefined && password.isDefined) {
        // Extract username and password from form data
-        val username = postData.get.get("username").flatMap(_.headOption).getOrElse("")
-        val password = postData.get.get("password").flatMap(_.headOption).getOrElse("")
-        val possibleUser = userManager.authenticate(username, password)
+        val possibleUser = userManager.authenticate(username.get, password.get)
        if (possibleUser.isDefined) {
-          Redirect(routes.MainMenuController.mainMenu()).withCookies(
+          Ok(Json.obj(
+            "status" -> "success",
+            "redirectUrl" -> routes.MainMenuController.mainMenu().url,
+            "content" -> views.html.mainmenu.creategame(possibleUser).toString
+          )).withCookies(
            Cookie("sessionId", sessionManager.createSession(possibleUser.get))
          )
        } else {
-          println("Failed login attempt for user: " + username)
          Unauthorized("Invalid username or password")
        }
      } else {
--- a/knockoutwhistweb/app/controllers/WebsocketController.scala
+++ b/knockoutwhistweb/app/controllers/WebsocketController.scala
@@ -0,0 +1,45 @@
+package controllers
+
+
+import auth.AuthAction
+import logic.PodManager
+import logic.user.SessionManager
+import model.sessions.{UserSession, UserWebsocketActor}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.stream.Materializer
+import play.api.*
+import play.api.libs.streams.ActorFlow
+import play.api.mvc.*
+
+import javax.inject.*
+
+
+@Singleton
+class WebsocketController @Inject()(
+                                     cc: ControllerComponents,
+                                     val sessionManger: SessionManager,
+                                   )(implicit system: ActorSystem, mat: Materializer) extends AbstractController(cc) {
+
+  def socket(): WebSocket = WebSocket.accept[String, String] { request =>
+    val session = request.cookies.get("sessionId")
+    if (session.isEmpty) throw new Exception("No session cookie found")
+    val userOpt = sessionManger.getUserBySession(session.get.value)
+    if (userOpt.isEmpty) throw new Exception("Invalid session")
+    val user = userOpt.get
+    val game = PodManager.identifyGameOfUser(user)
+    if (game.isEmpty) throw new Exception("User is not in a game")
+    val userSession = game.get.getUserSession(user.id)
+    ActorFlow.actorRef { out =>
+      println("Connect received")
+      KnockOutWebSocketActorFactory.create(out, userSession)
+    }
+  }
+
+  object KnockOutWebSocketActorFactory {
+    def create(out: ActorRef, userSession: UserSession): Props = {
+      Props(new UserWebsocketActor(out, userSession))
+    }
+  }
+
+
+}
--- a/knockoutwhistweb/app/logic/PodManager.scala
+++ b/knockoutwhistweb/app/logic/PodManager.scala
@@ -11,20 +11,20 @@ import util.GameUtil
 import javax.inject.Singleton
 import scala.collection.mutable

-@Singleton
-class PodManager {
+object PodManager {

  val TTL: Long = System.currentTimeMillis() + 86400000L // 24 hours in milliseconds
  val podIp: String = System.getenv("POD_IP")
  val podName: String = System.getenv("POD_NAME")
-  
+
  private val sessions: mutable.Map[String, GameLobby] = mutable.Map()
+  private val userSession: mutable.Map[User, String] = mutable.Map()
  private val injector: Injector = Guice.createInjector(KnockOutWebConfigurationModule())
-  
+
  def createGame(
-                host: User,
-                name: String,
-                maxPlayers: Int
+                  host: User,
+                  name: String,
+                  maxPlayers: Int
                ): GameLobby = {
    val gameLobby = GameLobby(
      logic = BaseGameLogic(injector.getInstance(classOf[Configuration])),
@@ -35,15 +35,39 @@ class PodManager {
      host = host
    )
    sessions += (gameLobby.id -> gameLobby)
+    userSession += (host -> gameLobby.id)
    gameLobby
  }

  def getGame(gameId: String): Option[GameLobby] = {
    sessions.get(gameId)
  }
-  
-  private[logic] def removeGame(gameId: String): Unit = {
-    sessions.remove(gameId)
+
+  def registerUserToGame(user: User, gameId: String): Boolean = {
+    if (sessions.contains(gameId)) {
+      userSession += (user -> gameId)
+      true
+    } else {
+      false
+    }
  }

+  def unregisterUserFromGame(user: User): Unit = {
+    userSession.remove(user)
+  }
+
+  def identifyGameOfUser(user: User): Option[GameLobby] = {
+    userSession.get(user) match {
+      case Some(gameId) => sessions.get(gameId)
+      case None => None
+    }
+  }
+
+  private[logic] def removeGame(gameId: String): Unit = {
+    sessions.remove(gameId)
+    // Also remove all user sessions associated with this game
+    userSession.filterInPlace((_, v) => v != gameId)
+  }
+
+
 }
--- a/knockoutwhistweb/app/logic/game/GameLobby.scala
+++ b/knockoutwhistweb/app/logic/game/GameLobby.scala
@@ -11,34 +11,40 @@ import de.knockoutwhist.player.{AbstractPlayer, PlayerFactory}
 import de.knockoutwhist.rounds.{Match, Round, Trick}
 import de.knockoutwhist.utils.events.{EventListener, SimpleEvent}
 import exceptions.*
+import logic.PodManager
 import model.sessions.{InteractionType, UserSession}
 import model.users.User
+import play.api.libs.json.{JsObject, Json}

 import java.util.UUID
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer

 class GameLobby private(
-                 val logic: GameLogic,
-                 val id: String,
-                 val internalId: UUID,
-                 val name: String,
-                 val maxPlayers: Int
-               ) extends EventListener {
+                         val logic: GameLogic,
+                         val id: String,
+                         val internalId: UUID,
+                         val name: String,
+                         val maxPlayers: Int
+                       ) extends EventListener {
+
+
+  private val users: mutable.Map[UUID, UserSession] = mutable.Map()
  logic.addListener(this)
  logic.createSession()

-  private val users: mutable.Map[UUID, UserSession] = mutable.Map()
-  
  def addUser(user: User): UserSession = {
    if (users.size >= maxPlayers) throw new GameFullException("The game is full!")
    if (users.contains(user.id)) throw new IllegalArgumentException("User is already in the game!")
    if (logic.getCurrentState != Lobby) throw new IllegalStateException("The game has already started!")
    val userSession = new UserSession(
      user = user,
-      host = false
+      host = false,
+      gameLobby = this
    )
    users += (user.id -> userSession)
+    PodManager.registerUserToGame(user, id)
+    //TODO : transmit Lobby Update transmitToAll()
    userSession
  }

@@ -51,8 +57,6 @@ class GameLobby private(
          return
        }
        users.values.foreach(session => session.updatePlayer(event))
-      case event: SessionClosed =>
-        users.values.foreach(session => session.updatePlayer(event))
      case event: SimpleEvent =>
        users.values.foreach(session => session.updatePlayer(event))
    }
@@ -60,6 +64,7 @@ class GameLobby private(

  /**
   * Start the game if the user is the host.
+   *
   * @param user the user who wants to start the game.
   */
  def startGame(user: User): Unit = {
@@ -86,6 +91,7 @@ class GameLobby private(

  /**
   * Remove the user from the game lobby.
+   *
   * @param user the user who wants to leave the game.
   */
  def leaveGame(userId: UUID): Unit = {
@@ -93,13 +99,29 @@ class GameLobby private(
    if (sessionOpt.isEmpty) {
      throw new NotInThisGameException("You are not in this game!")
    }
+    if (sessionOpt.get.host) {
+      logic.invoke(SessionClosed())
+      users.clear()
+      PodManager.removeGame(id)
+      return
+    }
+    sessionOpt.get.websocketActor.foreach(act => act.transmitJsonToClient(Json.obj(
+      "id" -> "-1",
+      "event" -> "SessionClosed",
+      "data" -> Json.obj(
+        "reason" -> "You left the game (or got kicked)."
+      )
+    )))
    users.remove(userId)
+    PodManager.unregisterUserFromGame(sessionOpt.get.user)
+    //TODO: transmit Lobby Update transmitToAll()
  }

  /**
   * Play a card from the player's hand.
+   *
   * @param userSession the user session of the player.
-   * @param cardIndex the index of the card in the player's hand.
+   * @param cardIndex   the index of the card in the player's hand.
   */
  def playCard(userSession: UserSession, cardIndex: Int): Unit = {
    val player = getPlayerInteractable(userSession, InteractionType.Card)
@@ -115,93 +137,6 @@ class GameLobby private(
    logic.playerInputLogic.receivedCard(card)
  }

-  /**
-   * Play a card from the player's hand while in dog life or skip the round.
-   * @param userSession the user session of the player.
-   * @param cardIndex the index of the card in the player's hand or -1 if the player wants to skip the round.
-   */
-  def playDogCard(userSession: UserSession, cardIndex: Int): Unit = {
-    val player = getPlayerInteractable(userSession, InteractionType.DogCard)
-    if (!player.isInDogLife) {
-      throw new CantPlayCardException("You are not in dog life!")
-    }
-    if (cardIndex == -1) {
-      if (!MatchUtil.dogNeedsToPlay(getMatch, getRound)) {
-        throw new CantPlayCardException("You can't skip this round!")
-      }
-      logic.playerInputLogic.receivedDog(None)
-    }
-    val hand = getHand(player)
-    val card = hand.cards(cardIndex)
-    userSession.resetCanInteract()
-    logic.playerInputLogic.receivedDog(Some(card))
-  }
-
-  /**
-   * Select the trump suit for the round.
-   * @param userSession the user session of the player.
-   * @param trumpIndex the index of the trump suit.
-   */
-  def selectTrump(userSession: UserSession, trumpIndex: Int): Unit = {
-    val player = getPlayerInteractable(userSession, InteractionType.TrumpSuit)
-    val trumpSuits = Suit.values.toList
-    val selectedTrump = trumpSuits(trumpIndex)
-    userSession.resetCanInteract()
-    logic.playerInputLogic.receivedTrumpSuit(selectedTrump)
-  }
-
-  /**
-   * 
-   * @param userSession
-   * @param tieNumber
-   */
-  def selectTie(userSession: UserSession, tieNumber: Int): Unit = {
-    val player = getPlayerInteractable(userSession, InteractionType.TieChoice)
-    userSession.resetCanInteract()
-    logic.playerTieLogic.receivedTieBreakerCard(tieNumber)
-  }
-
-  
-  //-------------------
-  
-  def getUserSession(userId: UUID): UserSession = {
-    val sessionOpt = users.get(userId)
-    if (sessionOpt.isEmpty) {
-      throw new NotInThisGameException("You are not in this game!")
-    }
-    sessionOpt.get
-  }
-
-  def getPlayerByUser(user: User): AbstractPlayer = {
-    getPlayerBySession(getUserSession(user.id))
-  }
-
-  def getPlayers: mutable.Map[UUID, UserSession] = {
-    users.clone()
-  }
-
-  def getLogic: GameLogic = {
-    logic
-  }
-
-  private def getPlayerBySession(userSession: UserSession): AbstractPlayer = {
-    val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
-    if (playerOption.isEmpty) {
-      throw new NotInThisGameException("You are not in this game!")
-    }
-    playerOption.get
-  }
-  
-  private def getPlayerInteractable(userSession: UserSession, iType: InteractionType): AbstractPlayer = {
-    if (!userSession.lock.isHeldByCurrentThread) {
-      throw new IllegalStateException("The user session is not locked!")
-    }
-    if (userSession.canInteract.isEmpty || userSession.canInteract.get != iType) {
-      throw new NotInteractableException("You can't play a card!")
-    }
-    getPlayerBySession(userSession)
-  }
-  
  private def getHand(player: AbstractPlayer): Hand = {
    val handOption = player.currentHand()
    if (handOption.isEmpty) {
@@ -209,14 +144,6 @@ class GameLobby private(
    }
    handOption.get
  }
-  
-  private def getMatch: Match = {
-    val matchOpt = logic.getCurrentMatch
-    if (matchOpt.isEmpty) {
-      throw new IllegalStateException("No match is currently running!")
-    }
-    matchOpt.get
-  }

  private def getRound: Round = {
    val roundOpt = logic.getCurrentRound
@@ -233,7 +160,128 @@ class GameLobby private(
    }
    trickOpt.get
  }
-  
+
+  /**
+   * Play a card from the player's hand while in dog life or skip the round.
+   *
+   * @param userSession the user session of the player.
+   * @param cardIndex   the index of the card in the player's hand or -1 if the player wants to skip the round.
+   */
+  def playDogCard(userSession: UserSession, cardIndex: Int): Unit = {
+    val player = getPlayerInteractable(userSession, InteractionType.DogCard)
+    if (!player.isInDogLife) {
+      throw new CantPlayCardException("You are not in dog life!")
+    }
+    if (cardIndex == -1) {
+      if (MatchUtil.dogNeedsToPlay(getMatch, getRound)) {
+        throw new CantPlayCardException("You can't skip this round!")
+      }
+      logic.playerInputLogic.receivedDog(None)
+      return
+    }
+    val hand = getHand(player)
+    val card = hand.cards(cardIndex)
+    userSession.resetCanInteract()
+    logic.playerInputLogic.receivedDog(Some(card))
+  }
+
+  /**
+   * Select the trump suit for the round.
+   *
+   * @param userSession the user session of the player.
+   * @param trumpIndex  the index of the trump suit.
+   */
+  def selectTrump(userSession: UserSession, trumpIndex: Int): Unit = {
+    val player = getPlayerInteractable(userSession, InteractionType.TrumpSuit)
+    val trumpSuits = Suit.values.toList
+    val selectedTrump = trumpSuits(trumpIndex)
+    userSession.resetCanInteract()
+    logic.playerInputLogic.receivedTrumpSuit(selectedTrump)
+  }
+
+
+  //-------------------
+
+  private def getPlayerInteractable(userSession: UserSession, iType: InteractionType): AbstractPlayer = {
+    if (!userSession.lock.isHeldByCurrentThread) {
+      throw new IllegalStateException("The user session is not locked!")
+    }
+    if (userSession.canInteract.isEmpty || userSession.canInteract.get != iType) {
+      throw new NotInteractableException("You can't play a card!")
+    }
+    getPlayerBySession(userSession)
+  }
+
+  /**
+   *
+   * @param userSession
+   * @param tieNumber
+   */
+  def selectTie(userSession: UserSession, tieNumber: Int): Unit = {
+    val player = getPlayerInteractable(userSession, InteractionType.TieChoice)
+    userSession.resetCanInteract()
+    logic.playerTieLogic.receivedTieBreakerCard(tieNumber)
+  }
+
+  def returnToLobby(userSession: UserSession): Unit = {
+    if (!users.contains(userSession.id)) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    val session = users(userSession.id)
+    if (session != userSession) {
+      throw new IllegalArgumentException("User session does not match!")
+    }
+    if (!session.host)
+      throw new NotHostException("Only the host can return to the lobby!")
+    logic.createSession()
+  }
+
+  def getPlayerByUser(user: User): AbstractPlayer = {
+    getPlayerBySession(getUserSession(user.id))
+  }
+
+  def getUserSession(userId: UUID): UserSession = {
+    val sessionOpt = users.get(userId)
+    if (sessionOpt.isEmpty) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    sessionOpt.get
+  }
+
+  private def getPlayerBySession(userSession: UserSession): AbstractPlayer = {
+    val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
+    if (playerOption.isEmpty) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    playerOption.get
+  }
+
+  private def getMatch: Match = {
+    val matchOpt = logic.getCurrentMatch
+    if (matchOpt.isEmpty) {
+      throw new IllegalStateException("No match is currently running!")
+    }
+    matchOpt.get
+  }
+
+  def getPlayers: mutable.Map[UUID, UserSession] = {
+    users.clone()
+  }
+
+  def getLogic: GameLogic = {
+    logic
+  }
+
+  def getUsers: Set[User] = {
+    users.values.map(d => d.user).toSet
+  }
+
+  private def transmitToAll(event: JsObject): Unit = {
+    users.values.foreach(session => {
+      session.websocketActor.foreach(act => act.transmitJsonToClient(event))
+    })
+  }
+
 }

 object GameLobby {
@@ -254,7 +302,8 @@ object GameLobby {
    )
    lobby.users += (host.id -> new UserSession(
      user = host,
-      host = true
+      host = true,
+      gameLobby = lobby
    ))
    lobby
  }
--- a/knockoutwhistweb/app/logic/user/SessionManager.scala
+++ b/knockoutwhistweb/app/logic/user/SessionManager.scala
@@ -6,9 +6,11 @@ import model.users.User

@ImplementedBy(classOf[BaseSessionManager])
 trait SessionManager {
-  
+
  def createSession(user: User): String
+
  def getUserBySession(sessionId: String): Option[User]
+
  def invalidateSession(sessionId: String): Unit

 }
--- a/knockoutwhistweb/app/logic/user/UserManager.scala
+++ b/knockoutwhistweb/app/logic/user/UserManager.scala
@@ -8,9 +8,13 @@ import model.users.User
 trait UserManager {

  def addUser(name: String, password: String): Boolean
+
  def authenticate(name: String, password: String): Option[User]
+
  def userExists(name: String): Option[User]
+
  def userExistsById(id: Long): Option[User]
+
  def removeUser(name: String): Boolean

 }
--- a/knockoutwhistweb/app/logic/user/impl/StubUserManager.scala
+++ b/knockoutwhistweb/app/logic/user/impl/StubUserManager.scala
@@ -9,7 +9,7 @@ import javax.inject.{Inject, Singleton}

@Singleton
 class StubUserManager @Inject()(val config: Config) extends UserManager {
-  
+
  private val user: Map[String, User] = Map(
    "Janis" -> User(
      internalId = 1L,
@@ -53,5 +53,5 @@ class StubUserManager @Inject()(val config: Config) extends UserManager {
  override def removeUser(name: String): Boolean = {
    throw new NotImplementedError("StubUserManager.removeUser is not implemented")
  }
-  
+
 }
--- a/knockoutwhistweb/app/model/sessions/InteractionType.scala
+++ b/knockoutwhistweb/app/model/sessions/InteractionType.scala
@@ -1,7 +1,7 @@
 package model.sessions

 enum InteractionType {
-  
+
  case TrumpSuit
  case Card
  case DogCard
--- a/knockoutwhistweb/app/model/sessions/PlayerSession.scala
+++ b/knockoutwhistweb/app/model/sessions/PlayerSession.scala
@@ -5,9 +5,11 @@ import de.knockoutwhist.utils.events.SimpleEvent
 import java.util.UUID

 trait PlayerSession {
-  
+
  def id: UUID
+
  def name: String
+
  def updatePlayer(event: SimpleEvent): Unit
-  
+
 }
--- a/knockoutwhistweb/app/model/sessions/SimpleSession.scala
+++ b/knockoutwhistweb/app/model/sessions/SimpleSession.scala
@@ -6,9 +6,9 @@ import de.knockoutwhist.utils.events.SimpleEvent
 import java.util.UUID

 case class SimpleSession(id: UUID, player: AbstractPlayer) extends PlayerSession {
-  
+
  def name: String = player.name
-  
+
  override def updatePlayer(event: SimpleEvent): Unit = {
  }
 }
--- a/knockoutwhistweb/app/model/sessions/UserSession.scala
+++ b/knockoutwhistweb/app/model/sessions/UserSession.scala
@@ -2,14 +2,18 @@ package model.sessions

 import de.knockoutwhist.events.player.{RequestCardEvent, RequestTieChoiceEvent, RequestTrumpSuitEvent}
 import de.knockoutwhist.utils.events.SimpleEvent
+import logic.game.GameLobby
 import model.users.User
+import play.api.libs.json.JsObject

 import java.util.UUID
-import java.util.concurrent.locks.{Lock, ReentrantLock}
+import java.util.concurrent.locks.ReentrantLock
+import scala.util.Try

-class UserSession(user: User, val host: Boolean) extends PlayerSession {
-  var canInteract: Option[InteractionType] = None
+class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) extends PlayerSession {
  val lock: ReentrantLock = ReentrantLock()
+  var canInteract: Option[InteractionType] = None
+  var websocketActor: Option[UserWebsocketActor] = None

  override def updatePlayer(event: SimpleEvent): Unit = {
    event match {
@@ -27,9 +31,21 @@ class UserSession(user: User, val host: Boolean) extends PlayerSession {
  override def id: UUID = user.id

  override def name: String = user.name
-  
+
  def resetCanInteract(): Unit = {
    canInteract = None
  }
-  
+
+  def handleWebResponse(eventType: String, data: JsObject): Unit = {
+    lock.lock()
+    Try {
+      eventType match {
+        case "Ping" =>
+          // No action needed for Ping
+          ()
+      }
+    }
+    lock.unlock()
+  }
+
 }
--- a/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala
+++ b/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala
@@ -0,0 +1,94 @@
+package model.sessions
+
+import de.knockoutwhist.utils.events.SimpleEvent
+import org.apache.pekko.actor.{Actor, ActorRef}
+import play.api.libs.json.{JsObject, JsValue, Json}
+import util.WebsocketEventMapper
+
+import scala.util.{Failure, Success, Try}
+
+class UserWebsocketActor(
+                          out: ActorRef,
+                          session: UserSession
+                        ) extends Actor {
+
+  if (session.websocketActor.isDefined) {
+    session.websocketActor.foreach(actor => actor.transmitTextToClient("Error: Multiple websocket connections detected. Closing this connection."))
+    context.stop(self)
+  } else {
+    session.websocketActor = Some(this)
+  }
+
+  override def receive: Receive = {
+    case msg: String =>
+      val jsonObject = Try {
+        Json.parse(msg)
+      }
+      Try {
+        jsonObject match {
+          case Success(value) =>
+            handle(value)
+          case Failure(exception) =>
+            transmitTextToClient(s"Error parsing JSON: ${exception.getMessage}")
+        }
+      }.failed.foreach(
+        ex => transmitTextToClient(s"Error handling message: ${ex.getMessage}")
+      )
+    case other =>
+  }
+
+  private def transmitTextToClient(text: String): Unit = {
+    out ! text
+  }
+
+  private def handle(json: JsValue): Unit = {
+    val idOpt = (json \ "id").asOpt[String]
+    if (idOpt.isEmpty) {
+      transmitJsonToClient(Json.obj(
+        "status" -> "error",
+        "error" -> "Missing 'id' field"
+      ))
+      return
+    }
+    val id = idOpt.get
+    val eventOpt = (json \ "event").asOpt[String]
+    if (eventOpt.isEmpty) {
+      transmitJsonToClient(Json.obj(
+        "id" -> id,
+        "event" -> null,
+        "status" -> "error",
+        "error" -> "Missing 'event' field"
+      ))
+      return
+    }
+    val event = eventOpt.get
+    val data = (json \ "data").asOpt[JsObject].getOrElse(Json.obj())
+    val result = Try {
+      session.handleWebResponse(event, data)
+    }
+    if (result.isSuccess) {
+      transmitJsonToClient(Json.obj(
+        "id" -> id,
+        "event" -> event,
+        "status" -> "success"
+      ))
+    } else {
+      transmitJsonToClient(Json.obj(
+        "id" -> id,
+        "event" -> event,
+        "status" -> "error",
+        "error" -> result.failed.get.getMessage
+      ))
+    }
+  }
+
+  def transmitJsonToClient(jsonObj: JsObject): Unit = {
+    out ! jsonObj.toString()
+  }
+
+  def transmitEventToClient(event: SimpleEvent): Unit = {
+    val jsonString = WebsocketEventMapper.toJsonString(event)
+    out ! jsonString
+  }
+
+}
--- a/knockoutwhistweb/app/model/users/User.scala
+++ b/knockoutwhistweb/app/model/users/User.scala
@@ -3,10 +3,10 @@ package model.users
 import java.util.UUID

 case class User(
-               internalId: Long,
-               id: UUID,
-               name: String,
-               passwordHash: String
+                 internalId: Long,
+                 id: UUID,
+                 name: String,
+                 passwordHash: String
               ) {

  def withName(newName: String): User = {
--- a/knockoutwhistweb/app/services/JwtKeyProvider.scala
+++ b/knockoutwhistweb/app/services/JwtKeyProvider.scala
@@ -12,10 +12,28 @@ import javax.inject.*
@Singleton
 class JwtKeyProvider @Inject()(config: Configuration) {

-  private def cleanPem(pem: String): String =
-    pem.replaceAll("-----BEGIN (.*)-----", "")
-      .replaceAll("-----END (.*)-----", "")
-      .replaceAll("\\s", "")
+  val publicKey: RSAPublicKey = {
+    val pemOpt = config.getOptional[String]("auth.publicKeyPem")
+    val fileOpt = config.getOptional[String]("auth.publicKeyFile")
+
+    pemOpt.orElse(fileOpt.map { path =>
+      new String(Files.readAllBytes(Paths.get(path)))
+    }) match {
+      case Some(pem) => loadPublicKeyFromPem(pem)
+      case None => throw new RuntimeException("No RSA public key configured.")
+    }
+  }
+  val privateKey: RSAPrivateKey = {
+    val pemOpt = config.getOptional[String]("auth.privateKeyPem")
+    val fileOpt = config.getOptional[String]("auth.privateKeyFile")
+
+    pemOpt.orElse(fileOpt.map { path =>
+      new String(Files.readAllBytes(Paths.get(path)))
+    }) match {
+      case Some(pem) => loadPrivateKeyFromPem(pem)
+      case None => throw new RuntimeException("No RSA private key configured.")
+    }
+  }

  private def loadPublicKeyFromPem(pem: String): RSAPublicKey = {
    val decoded = Base64.getDecoder.decode(cleanPem(pem))
@@ -29,28 +47,9 @@ class JwtKeyProvider @Inject()(config: Configuration) {
    KeyFactory.getInstance("RSA").generatePrivate(spec).asInstanceOf[RSAPrivateKey]
  }

-  val publicKey: RSAPublicKey = {
-    val pemOpt = config.getOptional[String]("auth.publicKeyPem")
-    val fileOpt = config.getOptional[String]("auth.publicKeyFile")
+  private def cleanPem(pem: String): String =
+    pem.replaceAll("-----BEGIN (.*)-----", "")
+      .replaceAll("-----END (.*)-----", "")
+      .replaceAll("\\s", "")

-    pemOpt.orElse(fileOpt.map { path =>
-      new String(Files.readAllBytes(Paths.get(path)))
-    }) match {
-      case Some(pem) => loadPublicKeyFromPem(pem)
-      case None => throw new RuntimeException("No RSA public key configured.")
-    }
-  }
-
-  val privateKey: RSAPrivateKey = {
-    val pemOpt = config.getOptional[String]("auth.privateKeyPem")
-    val fileOpt = config.getOptional[String]("auth.privateKeyFile")
-
-    pemOpt.orElse(fileOpt.map { path =>
-      new String(Files.readAllBytes(Paths.get(path)))
-    }) match {
-      case Some(pem) => loadPrivateKeyFromPem(pem)
-      case None => throw new RuntimeException("No RSA private key configured.")
-    }
-  }
-  
 }
--- a/knockoutwhistweb/app/util/GameUtil.scala
+++ b/knockoutwhistweb/app/util/GameUtil.scala
@@ -25,5 +25,5 @@ object GameUtil {

    code.toString()
  }
-  
+
 }
--- a/knockoutwhistweb/app/util/WebUIUtils.scala
+++ b/knockoutwhistweb/app/util/WebUIUtils.scala
@@ -8,6 +8,10 @@ import scalafx.scene.image.Image

 object WebUIUtils {
  def cardtoImage(card: Card): Html = {
+    views.html.render.card.apply(f"images/cards/${cardtoString(card)}.png")(card.toString)
+  }
+
+  def cardtoString(card: Card) = {
    val s = card.suit match {
      case Spades => "S"
      case Hearts => "H"
@@ -29,6 +33,7 @@ object WebUIUtils {
      case Three => "3"
      case Two => "2"
    }
-    views.html.render.card.apply(f"images/cards/$cv$s.png")(card.toString)
+    f"$cv$s"
  }
+
 }
--- a/knockoutwhistweb/app/util/WebsocketEventMapper.scala
+++ b/knockoutwhistweb/app/util/WebsocketEventMapper.scala
@@ -0,0 +1,20 @@
+package util
+
+import de.knockoutwhist.utils.events.SimpleEvent
+import tools.jackson.databind.json.JsonMapper
+import tools.jackson.module.scala.ScalaModule
+
+object WebsocketEventMapper {
+
+  private val scalaModule = ScalaModule.builder()
+    .addAllBuiltinModules()
+    .supportScala3Classes(true)
+    .build()
+
+  private val mapper = JsonMapper.builder().addModule(scalaModule).build()
+
+  def toJsonString(obj: SimpleEvent): String = {
+    mapper.writeValueAsString(obj)
+  }
+
+}
--- a/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
+++ b/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
@@ -0,0 +1,38 @@
+@(user: Option[model.users.User], gamelobby: logic.game.GameLobby)
+
+<main class="lobby-background vh-100" id="lobbybackground">
+    <div class="container d-flex flex-column" style="height: calc(100vh - 1rem);">
+        <div class="row">
+            <div class="col">
+                <div class="p-3 text-center fs-4">Winner: @gamelobby.getLogic.getWinner</div>
+            </div>
+        </div>
+        <div class="row justify-content-center align-items-center flex-grow-1">
+        @if((gamelobby.getUserSession(user.get.id).host)) {
+            <div class="col-12 text-center mb-5">
+                <div class="btn btn-success" onclick="backToLobby('@gamelobby.id')">Return to lobby</div>
+            </div>
+        } else {
+            <div class="col-12 text-center mt-3">
+                <div class="spinner-border mt-1" role="status">
+                    <span class="visually-hidden">Loading...</span>
+                </div>
+            </div>
+        }
+        </div>
+    </div>
+</main>
+<script>
+        function waitForFunction(name, checkInterval = 100) {
+            return new Promise(resolve => {
+                const timer = setInterval(() => {
+                    if (typeof window[name] === "function") {
+                        clearInterval(timer);
+                        resolve(window[name]);
+                    }
+                }, checkInterval);
+            });
+        }
+        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
+    connectWebSocket()
+</script>
--- a/knockoutwhistweb/app/views/ingame/ingame.scala.html
+++ b/knockoutwhistweb/app/views/ingame/ingame.scala.html
@@ -1,70 +1,113 @@
@import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.TrickUtil
+@import de.knockoutwhist.utils.Implicits.*

@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)

-@main("Ingame") {
-    <div class="py-5 ms-4 me-4">
+<div class="lobby-background vh-100">
+    <main class="game-field-background vh-100 ingame-side-shadow">
+        <div class="py-5 container-xxl">

-        <div class="row ms-4 me-4">
-            <div class="col-4 mt-5 text-start">
-                <h4 class="fw-semibold mb-1">Current Player</h4>
-                <p class="fs-5 text-primary">@gamelobby.getLogic.getCurrentPlayer.get.name</p>
-                @if(!TrickUtil.isOver(gamelobby.getLogic.getCurrentMatch.get, gamelobby.getLogic.getPlayerQueue.get)) {
-                    <h4 class="fw-semibold mb-1">Next Player</h4>
-                    @for(nextplayer <- gamelobby.getLogic.getPlayerQueue.get.duplicate()) {
-                        <p class="fs-5 text-primary">@nextplayer</p>
+            <div class="row ms-4 me-4">
+                <div class="col-4 mt-5 text-start">
+                    <h4 class="fw-semibold mb-1">Current Player</h4>
+                    <p class="fs-5 text-primary" id="current-player-name">@gamelobby.getLogic.getCurrentPlayer.get.name</p>
+                    @if(!TrickUtil.isOver(gamelobby.getLogic.getCurrentMatch.get, gamelobby.getLogic.getPlayerQueue.get)) {
+                        <h4 class="fw-semibold mb-1">Next Player</h4>
+                        @for(nextplayer <- gamelobby.getLogic.getPlayerQueue.get.duplicate()) {
+                            <p class="fs-5 text-primary" id="next-player-name">@nextplayer</p>
+                        }
                    }
-                }
-            </div>
+                </div>

-            <div class="d-flex col-md-4 text-center justify-content-center g-3 mb-5">
-                @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) {
-                    <div class="col-auto">
-                        <div class="card text-center shadow-sm border-0 bg-transparent" style="width: 7rem; backdrop-filter: blur(4px);">
-                            <div class="p-2">
-                                @util.WebUIUtils.cardtoImage(cardplayed) width="100%"/>
+                <div class="col-4 text-center">
+
+                    <div class="score-table mt-5" id="score-table-body">
+                        <h4 class="fw-bold mb-3 text-black">Tricks Won</h4>
+
+                        <div class="d-flex justify-content-between score-header pb-1">
+                            <div style="width: 50%">PLAYER</div>
+                            <div style="width: 50%">TRICKS</div>
+                        </div>
+
+                        @for(player <- gamelobby.getLogic.getPlayerQueue.get.toList.sortBy { p =>
+                            -(gamelobby.getLogic.getCurrentRound.get.tricklist.filter { trick => trick.winner.contains(p) }.size)
+                        }) {
+                            <div class="d-flex justify-content-between score-row pt-1">
+                                <div style="width: 50%" class="text-truncate">@player.name</div>
+                                <div style="width: 50%">
+                                @(gamelobby.getLogic.getCurrentRound.get.tricklist.filter { trick => trick.winner.contains(player) }.size)
+                                </div>
                            </div>
-                            <div class="card-body p-2 bg-transparent">
-                                <small class="fw-semibold text-secondary">@player</small>
+                        }
+
+                    </div>
+                    <div class="d-flex justify-content-center g-3 mb-5" id="trick-cards-container">
+                    @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) {
+                        <div class="col-auto">
+                            <div class="card text-center shadow-sm border-0 bg-transparent" style="width: 7rem;
+                                backdrop-filter: blur(4px);">
+                                <div class="p-2">
+                                    @util.WebUIUtils.cardtoImage(cardplayed) width="100%"/>
+                                </div>
+                                <div class="card-body p-2 bg-transparent">
+                                    <small class="fw-semibold text-secondary">@player</small>
+                                </div>
                            </div>
                        </div>
+                    }
                    </div>
-                }
+                </div>
+                <div class="col-4 mt-5 text-end">
+                    <h4 class="fw-semibold mb-1">Trumpsuit</h4>
+                    <p class="fs-5 text-primary" id="trumpsuit">@gamelobby.getLogic.getCurrentRound.get.trumpSuit</p>
+
+                    <h5 class="fw-semibold mt-4 mb-1">First Card</h5>
+                    <div class="d-inline-block border rounded shadow-sm p-1 bg-light" id="first-card-container">
+                    @if(gamelobby.getLogic.getCurrentTrick.get.firstCard.isDefined) {
+                        @util.WebUIUtils.cardtoImage(gamelobby.getLogic.getCurrentTrick.get.firstCard.get)
+                        width="80px"/>
+                    } else {
+                        @views.html.render.card.apply("images/cards/1B.png")("Blank Card") width="80px"/>
+                    }
+                    </div>
+                </div>
            </div>

-            <div class="col-md-4 text-end">
-                <h4 class="fw-semibold mb-1">Trumpsuit</h4>
-                <p class="fs-5 text-primary">@gamelobby.getLogic.getCurrentRound.get.trumpSuit</p>
-
-                <h5 class="fw-semibold mt-4 mb-1">First Card</h5>
-                <div class="d-inline-block border rounded shadow-sm p-1 bg-light">
-                @if(gamelobby.getLogic.getCurrentTrick.get.firstCard.isDefined) {
-                    @util.WebUIUtils.cardtoImage(gamelobby.getLogic.getCurrentTrick.get.firstCard.get) width="80px"/>
-                } else {
-                    @views.html.render.card.apply("images/cards/1B.png")("Blank Card") width="80px"/>
+            <div class="row justify-content-center g-2 mt-4 bottom-div" style="backdrop-filter: blur(4px);
+                margin-left: 0;
+                margin-right: 0;">
+                <div class="row justify-content-center ingame-cards-slide @{
+                    !gamelobby.logic.getCurrentPlayer.contains(player) ? "inactive" |: ""
+                }" id="card-slide">
+                @for(i <- player.currentHand().get.cards.indices) {
+                    <div class="col-auto handcard" style="border-radius: 6px">
+                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-card-id="@i" style="border-radius: 6px" onclick="handlePlayCard(this, '@gamelobby.id', '@player.isInDogLife')">
+                            @util.WebUIUtils.cardtoImage(player.currentHand().get.cards(i)) width="120px" style="border-radius: 6px"/>
+                        </div>
+                        @if(player.isInDogLife) {
+                            <div class="mt-2">
+                                <button class="btn btn-danger" onclick="handleSkipDogLife(this, '@gamelobby.id')">
+                                    Skip Dog Life</button>
+                            </div>
+                        }
+                    </div>
                }
                </div>
            </div>
        </div>
-
-
-        <div class="row">
-
-        </div>
-
-        <div class="row justify-content-center g-2 mt-4 bottom-div" style="backdrop-filter: blur(4px);">
-            <div class="row justify-content-center" id="card-slide">
-                @for(i <- player.currentHand().get.cards.indices) {
-                    <div class="col-auto handcard" style="border-radius: 6px">
-                        <form action="@(routes.IngameController.playCard(gamelobby.id))" method="post" class="m-0 p-0" style="border-radius: 6px">
-                            <input type="hidden" name="cardId" value="@i" />
-                            <button type="submit" class="btn btn-outline-light p-0 border-0 shadow-none" style="border-radius: 6px">
-                                @util.WebUIUtils.cardtoImage(player.currentHand().get.cards(i)) width="120px" style="border-radius: 6px"/>
-                            </button>
-                        </form>
-                    </div>
-                }
-            </div>
-        </div>
-    </div>
-}
+    </main>
+</div>
+<script>
+        function waitForFunction(name, checkInterval = 100) {
+            return new Promise(resolve => {
+                const timer = setInterval(() => {
+                    if (typeof window[name] === "function") {
+                        clearInterval(timer);
+                        resolve(window[name]);
+                    }
+                }, checkInterval);
+            });
+        }
+        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
+    connectWebSocket()
+</script>
--- a/knockoutwhistweb/app/views/ingame/selecttrump.scala.html
+++ b/knockoutwhistweb/app/views/ingame/selecttrump.scala.html
@@ -1,27 +1,77 @@
-@(player: de.knockoutwhist.player.AbstractPlayer, logic: de.knockoutwhist.control.GameLogic)
+@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)

-@main("Selecting Trumpsuit...") {
 <div id="selecttrumpsuit" class="game-field game-field-background">
-    @if(player.equals(logic.getCurrentMatch.get.roundlist.last.winner.get)) {
-        <h1>Knockout Whist</h1>
-        <p>You (@player.toString) have won the last round! Select a trumpsuit for the next round!</p>
-        <p>Available trumpsuits are displayed below:</p>
-        <div id="playercards">
-            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades))
-            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs))
-            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts))
-            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds))
-        </div>
-        <p>Your cards</p>
+    <div class="ingame-stage blur-sides">
+        <div class="container py-4">
+            <div class="row justify-content-center">
+                <div class="col-12">
+                    <div class="card shadow-sm">
+                        <div class="card-header text-center">
+                            <h3 class="mb-0">Select Trump Suit</h3>
+                        </div>
+                        <div class="card-body">
+                            @if(player.equals(gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get)) {
+                                <div class="alert alert-info" role="alert" aria-live="polite">
+                                    You (@player.toString) won the last round. Choose the trump suit for the next round.
+                                </div>

-        <div id="playercards">
-            @for(card <- player.currentHand().get.cards) {
-            @util.WebUIUtils.cardtoImage(card)
-            }
+                                <div class="row justify-content-center col-auto mb-5">
+                                    <div class="col-auto handcard">
+                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="0" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
+                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades))
+                                            width="120px" style="border-radius: 6px"/>
+                                        </div>
+                                    </div>
+                                    <div class="col-auto handcard">
+                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="1" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
+                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts))
+                                            width="120px" style="border-radius: 6px"/>
+                                        </div>
+                                    </div>
+                                    <div class="col-auto handcard">
+                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="2" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
+                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds))
+                                            width="120px" style="border-radius: 6px"/>
+                                        </div>
+                                    </div>
+                                    <div class="col-auto handcard">
+                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="3" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
+                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs))
+                                            width="120px" style="border-radius: 6px"/>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row justify-content-center ingame-cards-slide" id="card-slide">
+                                @for(i <- player.currentHand().get.cards.indices) {
+                                    <div class="col-auto" style="border-radius: 6px">
+                                        @util.WebUIUtils.cardtoImage(player.currentHand().get.cards(i)) width="120px" style="border-radius: 6px"/>
+                                    </div>
+                                }
+                                </div>
+                            } else {
+                                <div class="alert alert-warning" role="alert" aria-live="polite">
+                                    @gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get.name
+                                    is choosing a trumpsuit. The new round will start once a suit is picked.
+                                </div>
+                            }
+                        </div>
+                    </div>
+                </div>
+            </div>
        </div>
-    } else {
-    <h1>Knockout Whist</h1>
-    <p>@player.toString is choosing a trumpsuit. Starting new round when @player.toString picked a trumpsuit...</p>
-    }
+    </div>
 </div>
-}
+<script>
+        function waitForFunction(name, checkInterval = 100) {
+            return new Promise(resolve => {
+                const timer = setInterval(() => {
+                    if (typeof window[name] === "function") {
+                        clearInterval(timer);
+                        resolve(window[name]);
+                    }
+                }, checkInterval);
+            });
+        }
+        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
+    connectWebSocket()
+</script>
--- a/knockoutwhistweb/app/views/ingame/tie.scala.html
+++ b/knockoutwhistweb/app/views/ingame/tie.scala.html
@@ -1,27 +1,125 @@
-@(player: de.knockoutwhist.player.AbstractPlayer, logic: de.knockoutwhist.control.GameLogic)
-
-@main("Tie") {
+@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
 <div id="tie" class="game-field game-field-background">
-    <h1>Knockout Whist</h1>
-    <p>The last Round was tied between
-    @for(players <- logic.playerTieLogic.getTiedPlayers) {
-        @players
-    }
-    </p>
-    @if(player.equals(logic.playerTieLogic.currentTiePlayer())) {
-        <p>Pick a card between 1 and @logic.playerTieLogic.highestAllowedNumber()! The resulting card will be your card for the cut.</p>
-    } else {
-        <p>@logic.playerTieLogic.currentTiePlayer() is currently picking his number for the cut.</p>
-        <p>Currently picked Cards:</p>
-        <div id="cardsplayed">
-            @for((player, card) <- logic.playerTieLogic.getSelectedCard) {
-            <div id="playedcardplayer">
-                <p>@player</p>
-                @util.WebUIUtils.cardtoImage(card)
-            </div>
-            }
-        </div>
-    }
+    <div class="ingame-stage blur-sides">
+        <div class="container py-4">
+            <div class="row justify-content-center">
+                <div class="col-12 col-md-10 col-lg-8">
+                    <div class="card shadow-sm">
+                        <div class="card-header text-center">
+                            <h3 class="mb-0">Tie Break</h3>
+                        </div>
+                        <div class="card-body">
+                            <div class="mb-3">
+                                <p class="card-text">
+                                    The last round was tied between:
+                                    <span class="ms-1">
+                                        @for(players <- gamelobby.logic.playerTieLogic.getTiedPlayers) {
+                                            <span class="badge text-bg-secondary me-1">@players</span>
+                                        }
+                                    </span>
+                                </p>
+                            </div>

+                            @if(player.equals(gamelobby.logic.playerTieLogic.currentTiePlayer())) {
+                                @defining(gamelobby.logic.playerTieLogic.highestAllowedNumber()) { maxNum =>
+                                    <div class="alert alert-info" role="alert" aria-live="polite">
+                                        Pick a number between 1 and @{
+                                        maxNum + 1
+                                    }.
+                                    The resulting card will be your card for the cut.
+                                    </div>
+
+                                    <div class="row g-2 align-items-center">
+                                        <div class="col-auto">
+                                            <label for="tieNumber" class="col-form-label">Your number</label>
+                                        </div>
+                                        <div class="col-auto">
+                                            <input type="number" id="tieNumber" class="form-control" name="tie" min="1" max="@{
+                                                maxNum + 1
+                                            }" placeholder="1" required>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button onclick="selectTie('@gamelobby.id')" class="btn btn-primary">
+                                                Confirm</button>
+                                        </div>
+                                    </div>
+                                    <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
+
+                                    <div id="cardsplayed" class="row g-3 justify-content-center">
+                                    @if(gamelobby.logic.playerTieLogic.getSelectedCard.nonEmpty) {
+                                        @for((player, card) <- gamelobby.logic.playerTieLogic.getSelectedCard) {
+                                            <div class="col-6">
+                                                <div class="card shadow-sm border-0 h-100 text-center">
+                                                    <div class="card-body d-flex flex-column justify-content-between">
+                                                        <p class="card-text fw-semibold mb-2 text-primary">@player</p>
+                                                        <div class="card-img-top">
+                                                        @util.WebUIUtils.cardtoImage(card)
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        }
+                                    } else {
+                                        <div class="col-12">
+                                            <div class="alert alert-info text-center" role="alert">
+                                                <i class="bi bi-info-circle me-2"></i>
+                                                No cards have been selected yet.
+                                            </div>
+                                        </div>
+                                    }
+                                    </div>
+                                }
+                            } else {
+                                <div class="alert alert-warning" role="alert" aria-live="polite">
+                                    <strong>@gamelobby.logic.playerTieLogic.currentTiePlayer()</strong>
+                                    is currently picking a number for the cut.
+                                </div>
+
+                                <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
+
+                                <div id="cardsplayed" class="row g-3 justify-content-center">
+                                @if(gamelobby.logic.playerTieLogic.getSelectedCard.nonEmpty) {
+                                    @for((player, card) <- gamelobby.logic.playerTieLogic.getSelectedCard) {
+                                        <div class="col-6 col-sm-4 col-md-3 col-lg-2">
+                                            <div class="card shadow-sm border-0 h-100 text-center">
+                                                <div class="card-body d-flex flex-column justify-content-between">
+                                                    <p class="card-text fw-semibold mb-2 text-primary">@player</p>
+                                                    <div class="card-img-top">
+                                                    @util.WebUIUtils.cardtoImage(card)
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    }
+                                } else {
+                                    <div class="col-12">
+                                        <div class="alert alert-info text-center" role="alert">
+                                            <i class="bi bi-info-circle me-2"></i>
+                                            No cards have been selected yet.
+                                        </div>
+                                    </div>
+                                }
+                                </div>
+                            }
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
-}
+<script>
+        function waitForFunction(name, checkInterval = 100) {
+            return new Promise(resolve => {
+                const timer = setInterval(() => {
+                    if (typeof window[name] === "function") {
+                        clearInterval(timer);
+                        resolve(window[name]);
+                    }
+                }, checkInterval);
+            });
+        }
+        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
+    connectWebSocket()
+</script>
--- a/knockoutwhistweb/app/views/lobby/lobby.scala.html
+++ b/knockoutwhistweb/app/views/lobby/lobby.scala.html
@@ -1,82 +1,84 @@
@(user: Option[model.users.User], gamelobby: logic.game.GameLobby)

-@main("Lobby") {
-<div class="container">
-    <div class="row">
-        <div class="col">
-            <div class="p-3 fs-1 d-flex align-items-center">
-                <div class="text-center" style="flex-grow: 1;">
-                    Lobby-Name: @gamelobby.name
+<main class="lobby-background vh-100" id="lobbybackground">
+    <div class="container d-flex flex-column" style="height: calc(100vh - 1rem);">
+        <div class="row">
+            <div class="col">
+                <div class="p-3 fs-1 d-flex align-items-center">
+                    <div class="text-center" style="flex-grow: 1;">
+                        Lobby-Name: @gamelobby.name
+                    </div>
+                    <div class="btn btn-danger ms-auto" onclick="leaveGame('@gamelobby.id')">Exit</div>
                </div>
-                <form action="@(routes.IngameController.leaveGame(gamelobby.id))">
-                    <button type="submit" class="btn btn-danger ms-auto">Exit</button>
-                </form>
            </div>
        </div>
-    </div>
-    <div class="row">
-        <div class="col">
-            <div class="p-3 text-center fs-4">Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
+        <div class="row">
+            <div class="col">
+                <div class="p-3 text-center fs-4" id="playerAmount">
+                    Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
+            </div>
        </div>
-    </div>
-    <div class="row justify-content-center">
-
+        <div class="row justify-content-center align-items-center flex-grow-1">
        @if((gamelobby.getUserSession(user.get.id).host)) {
+            <div id="players" class="justify-content-center align-items-center d-flex">
            @for(playersession <- gamelobby.getPlayers.values) {
-                <div class="col-auto">
+                <div class="col-auto my-auto m-3">
                    <div class="card" style="width: 18rem;">
                        <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
                        <div class="card-body">
-                            @if(playersession.id == user.get.id) {
-                                <h5 class="card-title">@playersession.name (You)</h5>
-@*                                <p class="card-text">Your text could be here!</p>*@
-                                <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
-                            } else {
-                                <h5 class="card-title">@playersession.name</h5>
-@*                                <p class="card-text">Your text could be here!</p>*@
-                                <form action="@(routes.IngameController.kickPlayer(gamelobby.id, playersession.id))" method="post">
-                                    <button type="submit" class="btn btn-danger">Remove</button>
-                                </form>
-                            }
+                        @if(playersession.id == user.get.id) {
+                            <h5 class="card-title">@playersession.name (You)</h5>
+                            <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
+                        } else {
+                            <h5 class="card-title">@playersession.name</h5>
+                            <div class="btn btn-danger" onclick="removePlayer('@gamelobby.id', '@playersession.id')">
+                                Remove</div>
+                        }
                        </div>
                    </div>
                </div>
            }
-            <div class="row">
-                <div class="col text-center mt-3">
-                    <a href="@(routes.IngameController.startGame(gamelobby.id))" class="btn btn-success">Start Game</a>
-                </div>
+            </div>
+            <div class="col-12 text-center mb-5">
+                <div class="btn btn-success" onclick="startGame('@gamelobby.id')">Start Game</div>
            </div>
        } else {
+            <div id="players" class="justify-content-center align-items-center d-flex">
            @for(playersession <- gamelobby.getPlayers.values) {
-            <div class="col-auto">
-                <div class="card" style="width: 18rem;">
+                <div class="col-auto my-auto m-3"> <div class="card" style="width: 18rem;">
                    <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
                    <div class="card-body">
-                        @if(playersession.id == user.get.id) {
+                    @if(playersession.id == user.get.id) {
                        <h5 class="card-title">@playersession.name (You)</h5>
-                        } else {
+                    } else {
                        <h5 class="card-title">@playersession.name</h5>
-                        }
+                    }
                    </div>
                </div>
-            </div>
+                </div>
            }
-            <div class="row">
-                <div class="col mt-3">
-                    <p class="text-center fs-4">Waiting for the host to start the game...</p>
-                </div>
            </div>
-            <div class="row">
-                <div class="col mt-1">
-                    <div class="text-center">
-                        <div class="spinner-border" role="status">
-                            <span class="visually-hidden">Loading...</span>
-                        </div>
-                    </div>
+            <div class="col-12 text-center mt-3">
+                <p class="fs-4">Waiting for the host to start the game...</p>
+                <div class="spinner-border mt-1" role="status">
+                    <span class="visually-hidden">Loading...</span>
                </div>
            </div>
        }
+        </div>
    </div>
-</div>
-}
+</main>
+<script>
+        function waitForFunction(name, checkInterval = 100) {
+            return new Promise(resolve => {
+                const timer = setInterval(() => {
+                    if (typeof window[name] === "function") {
+                        clearInterval(timer);
+                        resolve(window[name]);
+                    }
+                }, checkInterval);
+            });
+        }
+        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
+    connectWebSocket()
+</script>
--- a/knockoutwhistweb/app/views/login/login.scala.html
+++ b/knockoutwhistweb/app/views/login/login.scala.html
@@ -1,47 +1,43 @@
@()
+<div class="login-box">
+    <div class="card login-card p-4">
+        <div class="card-body">
+            <h3 class="text-center mb-4 text-body">Login</h3>
+            <form onsubmit="login(); return false;">
+                <div class="mb-3">
+                    <label for="username" class="form-label text-body">Username</label>
+                    <input type="text" class="form-control text-body" id="username" name="username" placeholder="Enter Username" required>
+                </div>

-@main("Login") {
+                <div class="mb-3">
+                    <label for="password" class="form-label text-body">Password</label>
+                    <input type="password" class="form-control text-body" id="password" name="password" placeholder="Enter password" required>
+                </div>

-    <div class="login-box">
-        <div class="card login-card p-4">
-            <div class="card-body">
-                <h3 class="text-center mb-4 text-body">Login</h3>
+                <div class="d-flex justify-content-between align-items-center mb-3">
+                    <a href="#" class="text-decoration-none">Forgot password?</a>
+                </div>

-                <form action="@routes.UserController.login_Post()" method="post">
-                    <div class="mb-3">
-                        <label for="username" class="form-label text-body">Username</label>
-                        <input type="text" class="form-control text-body" id="username" name="username" placeholder="Enter Username" required>
-                    </div>
+                <div class="d-grid" >
+                    <button type="submit" class="btn btn-primary">Login</button>
+                </div>
+            </form>

-                    <div class="mb-3">
-                        <label for="password" class="form-label text-body">Password</label>
-                        <input type="password" class="form-control text-body" id="password" name="password" placeholder="Enter password" required>
-                    </div>
-
-                    <div class="d-flex justify-content-between align-items-center mb-3">
-                        <a href="#" class="text-decoration-none">Forgot password?</a>
-                    </div>
-
-                    <div class="d-grid">
-                        <button type="submit" class="btn btn-primary">Login</button>
-                    </div>
-                </form>
-
-                <p class="text-center mt-3">
-                    Don’t have an account?
-                    <a href="#" class="text-decoration-none">Sign up</a>
-                </p>
-            </div>
+            <p class="text-center mt-3">
+                Don’t have an account?
+                <a href="#" class="text-decoration-none">Sign up</a>
+            </p>
        </div>
    </div>
-    <script src="@routes.Assets.versioned("/javascripts/particles.js")"></script>
-    <script>
-            particlesJS.load('particles-js', 'assets/conf/particlesjs-config.json', function() {
-                console.log('callback - particles.js config loaded');
-            });
-    </script>
-    <div id="particles-js" style="background-color: rgb(11, 8, 8);
-        background-size: cover;
-        background-repeat: no-repeat;
-        background-position: 50% 50%;"></div>
-}
+</div>
+<script src="@routes.Assets.versioned("/javascripts/particles.js")"></script>
+<script>
+        particlesJS.load('particles-js', 'assets/conf/particlesjs-config.json', function() {
+            console.log('callback - particles.js config loaded');
+        });
+        disconnectWebSocket();
+</script>
+<div id="particles-js" style="background-color: rgb(11, 8, 8);
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: 50% 50%;"></div>
--- a/knockoutwhistweb/app/views/main.scala.html
+++ b/knockoutwhistweb/app/views/main.scala.html
@@ -1,8 +1,8 @@
@*
- * This template is called from the `index` template. This template
- * handles the rendering of the page header and body tags. It takes
- * two arguments, a `String` for the title of the page and an `Html`
- * object to insert into the body of the page.
+* This template is called from the `index` template. This template
+* handles the rendering of the page header and body tags. It takes
+* two arguments, a `String` for the title of the page and an `Html`
+* object to insert into the body of the page.
 *@
@(title: String)(content: Html)

@@ -18,17 +18,14 @@
        <link href="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
    </head>

-    <body class="d-flex flex-column min-vh-100 game-field-background">
-        <main>
-            @* And here's where we render the `Html` object containing
-             * the page content. *@
-            @content
-        </main>
-
-        <footer class="footer">
-        </footer>
-
-        <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
+    <body class="d-flex flex-column min-vh-100" id="main-body">
+        @* And here's where we render the `Html` object containing
+        * the page content. *@
+        @content
    </body>
+    <script src="@routes.JavaScriptRoutingController.javascriptRoutes()" type="text/javascript"></script>
+    <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script>
+    <script src="@routes.Assets.versioned("../../public/javascripts/websocket.js")" type="text/javascript"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 </html>
--- a/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
@@ -1,9 +1,8 @@
@(user: Option[model.users.User])

-@main("Create Game") {
@navbar(user)
-<form action="@routes.MainMenuController.createGame()" method="post" class="game-field-background">
-    <div class="w-50 mx-auto">
+<main class="lobby-background flex-grow-1">
+    <div class="w-25 mx-auto">
        <div class="mt-3">
            <label for="lobbyname" class="form-label">Lobby-Name</label>
            <input type="text" class="form-control" id="lobbyname" name="lobbyname" placeholder="Lobby 1" required>
@@ -12,21 +11,23 @@
            <input class="form-check-input" type="checkbox" id="visibilityswitch" disabled>
            <label class="form-check-label" for="visibilityswitch">public/private</label>
        </div>
-            <div class="mt-3">
-                <label for="playeramount" class="form-label">Playeramount:</label>
-                <input type="range" class="form-range text-body" min="2" max="7" value="2" id="playeramount" name="playeramount">
-                <div class="d-flex justify-content-between">
-                    <span>2</span>
-                    <span>3</span>
-                    <span>4</span>
-                    <span>5</span>
-                    <span>6</span>
-                    <span>7</span>
-                </div>
+        <div class="mt-3">
+            <label for="playeramount" class="form-label">Playeramount:</label>
+            <input type="range" class="form-range text-body" min="2" max="7" value="2" id="playeramount" name="playeramount">
+            <div class="d-flex justify-content-between">
+                <span>2</span>
+                <span>3</span>
+                <span>4</span>
+                <span>5</span>
+                <span>6</span>
+                <span>7</span>
            </div>
+        </div>
        <div class="mt-3 text-center">
-            <button type="submit" class="btn btn-success">Create Game</button>
+            <div class="btn btn-success" onclick="createGameJS()">Create Game</div>
        </div>
    </div>
-</form>
-}
+</main>
+<script>
+            disconnectWebSocket();
+    </script>
--- a/knockoutwhistweb/app/views/mainmenu/navbar.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/navbar.scala.html
@@ -1,57 +1,61 @@
@(user: Option[model.users.User])
-    <nav class="navbar navbar-expand-lg bg-body-tertiary">
-        <div class="container d-flex justify-content-left">
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-            <div class="collapse navbar-collapse justify-content-center" id="navBar">
-                <a class="navbar-brand ms-auto" href="@routes.MainMenuController.mainMenu()">
-                    <img src="@routes.Assets.versioned("images/logo.png")" alt="Logo" width="30" height="20" class="d-inline-block align-text-top">
-                    KnockOutWhist
-                </a>
-                <div class="navbar-nav me-auto mb-2 mb-lg-0">
-                    <ul class="navbar-nav mb-2 mb-lg-0">
-                        @if(user.isDefined) {
-                            <li class="nav-item">
-                                <a class="nav-link active" aria-current="page" href="@routes.MainMenuController.mainMenu()">Create Game</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link disabled" aria-disabled="true">Lobbies</a>
-                            </li>
-                        }
+<nav class="navbar navbar-expand-lg bg-body-tertiary navbar-drop-shadow">
+    <div class="container d-flex justify-content-start">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse justify-content-center" id="navBar">
+            <a class="navbar-brand ms-auto" href="@routes.MainMenuController.mainMenu()">
+                <img src="@routes.Assets.versioned("images/logo.png")" alt="Logo" width="30" height="20" class="d-inline-block align-text-top">
+                KnockOutWhist
+            </a>
+            <div class="navbar-nav me-auto mb-2 mb-lg-0">
+                <ul class="navbar-nav mb-2 mb-lg-0">
+                    @if(user.isDefined) {
                        <li class="nav-item">
-                            <a class="nav-link active" href="@routes.MainMenuController.rules()">Rules</a>
+                            <a class="nav-link active" aria-current="page" onclick="navSpa('0', 'Knockout Whist - Create Game'); return false;" href="@routes.MainMenuController.mainMenu()">
+                                Create Game</a>
                        </li>
-                    </ul>
-                    <form class="navbar-nav me-auto mb-2 mb-lg-0" method="post" action="@routes.MainMenuController.joinGame()">
-                        <input class="form-control me-2" type="text" placeholder="Enter GameCode" name="gameId" aria-label="Join Game"/>
-                        <button class="btn btn-outline-success" type="submit">Join</button>
-                    </form>
-                </div>
-
-                @* Right side: profile dropdown if logged in, otherwise Login / Sign Up buttons *@
-                @if(user.isDefined) {
-                    <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle d-flex align-items-center" href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="rounded-circle" width="30" height="30" />
-                                <span class="ms-2">@user.get.name</span>
-                            </a>
-                            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="profileDropdown">
-                                <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">Stats</a></li>
-                                <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">Settings</a></li>
-                                <li><hr class="dropdown-divider"></li>
-                                <li><a class="dropdown-item" href="@routes.UserController.logout()">Logout</a></li>
-                            </ul>
+                        <li class="nav-item">
+                            <a class="nav-link disabled" aria-disabled="true">Lobbies</a>
                        </li>
-                    </ul>
-                } else {
-                    <div class="d-flex ms-auto">
-                        <a class="btn btn-outline-primary me-2" href="@routes.UserController.login()">Login</a>
-                        <a class="btn btn-primary" href="@routes.UserController.login()">Sign Up</a>
-                    </div>
-                }
-
+                    }
+                    <li class="nav-item">
+                        <a class="nav-link active" onclick="navSpa('1', 'Knockout Whist - Rules'); return false;" href="@routes.MainMenuController.rules()">
+                            Rules</a>
+                    </li>
+                </ul>
+                <form class="navbar-nav me-auto mb-2 mb-lg-0" onsubmit="joinGame(); return false;">
+                    <input class="form-control me-2" type="text" placeholder="Enter GameCode" id="gameId" aria-label="Join Game"/>
+                    <button class="btn btn-outline-success" type="submit">Join</button>
+                </form>
            </div>
+
+            @* Right side: profile dropdown if logged in, otherwise Login / Sign Up buttons *@
+            @if(user.isDefined) {
+                <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle d-flex align-items-center" href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="rounded-circle" width="30" height="30" />
+                            <span class="ms-2">@user.get.name</span>
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="profileDropdown">
+                            <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">
+                                Stats</a></li>
+                            <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">
+                                Settings</a></li>
+                            <li><hr class="dropdown-divider"></li>
+                            <li><a class="dropdown-item" href="@routes.UserController.logout()">Logout</a></li>
+                        </ul>
+                    </li>
+                </ul>
+            } else {
+                <div class="d-flex ms-auto">
+                    <a class="btn btn-outline-primary me-2" href="@routes.UserController.login()">Login</a>
+                    <a class="btn btn-primary" href="@routes.UserController.login()">Sign Up</a>
+                </div>
+            }
+
        </div>
-    </nav>
+    </div>
+</nav>
--- a/knockoutwhistweb/app/views/mainmenu/rules.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/rules.scala.html
@@ -1,76 +1,180 @@
@(user: Option[model.users.User])
+@navbar(user)

-@main("Rules") {
-    @navbar(user)
-<div id="rules">
-    <div class="container my-4">
-    <div class="card shadow-sm rounded-3">
-        <div class="card-header text-white text-center">
-            <h4 class="mb-0 text-body">Game Rules Overview</h4>
-        </div>
-        <div class="card-body p-0">
-            <div class="table-responsive">
-                <table class="table table-striped table-hover mb-0 align-middle">
-                    <thead class="table-dark">
-                        <tr>
-                            <th scope="col">Section</th>
-                            <th scope="col">Details</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>Players</td>
-                            <td>Two to seven players. The aim is to be the last player left in the game.</td>
-                        </tr>
-                        <tr>
-                            <td>Aim</td>
-                            <td>To be the last player left at the end of the game, with the object in each hand being to win a majority of tricks.</td>
-                        </tr>
-                        <tr>
-                            <td>Equipment</td>
-                            <td>A standard 52-card pack is used.</td>
-                        </tr>
-                        <tr>
-                            <td>Card Ranks</td>
-                            <td>In each suit, cards rank from highest to lowest: A K Q J 10 9 8 7 6 5 4 3 2.</td>
-                        </tr>
-                        <tr>
-                            <td>Deal (First Hand)</td>
-                            <td>The dealer deals seven cards to each player. One card is turned up to determine the trump suit for the round.</td>
-                        </tr>
-                        <tr>
-                            <td>Deal (Subsequent Hands)</td>
-                            <td>The deal rotates clockwise. The player who took the most tricks in the previous hand selects the trump suit. If there's a tie, players cut cards to decide who calls trumps. One fewer card is dealt in each successive hand until the final hand consists of one card each.</td>
-                        </tr>
-                        <tr>
-                            <td>Play</td>
-                            <td>The player to the dealer's left (eldest hand) leads the first trick. Any card can be led. Other players must follow suit if possible. A player with no cards of the suit led may play any card.</td>
-                        </tr>
-                        <tr>
-                            <td>Winning a Trick</td>
-                            <td>The highest card of the suit led wins, unless a trump is played, in which case the highest trump wins. The winner of the trick leads the next.</td>
-                        </tr>
-                        <tr>
-                            <td>Leading Trumps</td>
-                            <td>Some rules disallow leading trumps before the suit has been 'broken' (a trump has been played to the lead of another suit). Leading trumps is always permissible if a player holds only trumps.</td>
-                        </tr>
-                        <tr>
-                            <td>Knockout</td>
-                            <td>At the end of each hand, any player who took no tricks is knocked out and takes no further part in the game.</td>
-                        </tr>
-                        <tr>
-                            <td>Winning the Game</td>
-                            <td>The game is won when a player takes all the tricks in a round, as all other players are knocked out, leaving only one player remaining.</td>
-                        </tr>
-                        <tr>
-                            <td>Dog Life</td>
-                            <td>The first player who takes no tricks is awarded a "dog's life". In the next hand, that player is dealt one card and can decide which trick to play it to. Each time a trick is played the "dog" may either play the card or knock on the table and wait to play it later. If the dog wins a trick, the player to the left leads the next and the dog re-enters the game properly in the next hand. If the dog fails, they are knocked out.</td>
-                        </tr>
-                    </tbody>
-                </table>
+<main class="lobby-background flex-grow-1">
+    <div class="container my-4" style="max-width: 980px;">
+        <div class="card rules-card shadow-sm rounded-3 overflow-hidden">
+            <div class="card-header text-center py-3 border-0">
+                <h3 class="mb-0 rules-title">Game Rules Overview</h3>
+            </div>
+
+            <div class="card-body p-0">
+                <style>
+
+                </style>
+
+                <div class="accordion rules-accordion" id="rulesAccordion">
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingPlayers">
+                            <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePlayers" aria-expanded="true" aria-controls="collapsePlayers">
+                                Players
+                            </button>
+                        </h2>
+                        <div id="collapsePlayers" class="accordion-collapse collapse show" aria-labelledby="headingPlayers" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                Two to seven players. The aim is to be the last player left in the game.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingAim">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAim" aria-expanded="false" aria-controls="collapseAim">
+                                Aim
+                            </button>
+                        </h2>
+                        <div id="collapseAim" class="accordion-collapse collapse" aria-labelledby="headingAim" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                To be the last player left at the end of the game, with the object in each hand being to win a majority of tricks.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingEquipment">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseEquipment" aria-expanded="false" aria-controls="collapseEquipment">
+                                Equipment
+                            </button>
+                        </h2>
+                        <div id="collapseEquipment" class="accordion-collapse collapse" aria-labelledby="headingEquipment" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                A standard 52-card pack is used.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingRanks">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseRanks" aria-expanded="false" aria-controls="collapseRanks">
+                                Card Ranks
+                            </button>
+                        </h2>
+                        <div id="collapseRanks" class="accordion-collapse collapse" aria-labelledby="headingRanks" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                In each suit, cards rank from highest to lowest: A K Q J 10 9 8 7 6 5 4 3 2.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingDealFirst">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDealFirst" aria-expanded="false" aria-controls="collapseDealFirst">
+                                Deal (First Hand)
+                            </button>
+                        </h2>
+                        <div id="collapseDealFirst" class="accordion-collapse collapse" aria-labelledby="headingDealFirst" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                The dealer deals seven cards to each player. One card is turned up to determine the trump suit for the round.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingDealSubsequent">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDealSubsequent" aria-expanded="false" aria-controls="collapseDealSubsequent">
+                                Deal (Subsequent Hands)
+                            </button>
+                        </h2>
+                        <div id="collapseDealSubsequent" class="accordion-collapse collapse" aria-labelledby="headingDealSubsequent" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                The deal rotates clockwise. The player who took the most tricks in the previous hand selects the trump suit. If there's a tie, players cut cards to decide who calls trumps. One fewer card is dealt in each successive hand until the final hand consists of one card each.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingPlay">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePlay" aria-expanded="false" aria-controls="collapsePlay">
+                                Play
+                            </button>
+                        </h2>
+                        <div id="collapsePlay" class="accordion-collapse collapse" aria-labelledby="headingPlay" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                The player to the dealer's left (eldest hand) leads the first trick. Any card can be led. Other players must follow suit if possible. A player with no cards of the suit led may play any card.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingWinningTrick">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseWinningTrick" aria-expanded="false" aria-controls="collapseWinningTrick">
+                                Winning a Trick
+                            </button>
+                        </h2>
+                        <div id="collapseWinningTrick" class="accordion-collapse collapse" aria-labelledby="headingWinningTrick" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                The highest card of the suit led wins, unless a trump is played, in which case the highest trump wins. The winner of the trick leads the next.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingLeadingTrumps">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseLeadingTrumps" aria-expanded="false" aria-controls="collapseLeadingTrumps">
+                                Leading Trumps
+                            </button>
+                        </h2>
+                        <div id="collapseLeadingTrumps" class="accordion-collapse collapse" aria-labelledby="headingLeadingTrumps" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                Some rules disallow leading trumps before the suit has been 'broken' (a trump has been played to the lead of another suit). Leading trumps is always permissible if a player holds only trumps.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingKnockout">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseKnockout" aria-expanded="false" aria-controls="collapseKnockout">
+                                Knockout
+                            </button>
+                        </h2>
+                        <div id="collapseKnockout" class="accordion-collapse collapse" aria-labelledby="headingKnockout" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                At the end of each hand, any player who took no tricks is knocked out and takes no further part in the game.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingWinningGame">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseWinningGame" aria-expanded="false" aria-controls="collapseWinningGame">
+                                Winning the Game
+                            </button>
+                        </h2>
+                        <div id="collapseWinningGame" class="accordion-collapse collapse" aria-labelledby="headingWinningGame" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                The game is won when a player takes all the tricks in a round, as all other players are knocked out, leaving only one player remaining.
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="headingDogLife">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDogLife" aria-expanded="false" aria-controls="collapseDogLife">
+                                Dog Life
+                            </button>
+                        </h2>
+                        <div id="collapseDogLife" class="accordion-collapse collapse" aria-labelledby="headingDogLife" data-bs-parent="#rulesAccordion">
+                            <div class="accordion-body">
+                                The first player who takes no tricks is awarded a \"dog's life\". In the next hand, that player is dealt one card and can decide which trick to play it to. Each time a trick is played the dog may either play the card or knock on the table and wait to play it later. If the dog wins a trick, the player to the left leads the next and the dog re-enters the game properly in the next hand. If the dog fails, they are knocked out.
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
            </div>
        </div>
    </div>
-</div>
-</div>
-}
+</main>
+<script>
+        disconnectWebSocket();
+</script>
--- a/knockoutwhistweb/conf/logback.xml
+++ b/knockoutwhistweb/conf/logback.xml
@@ -5,46 +5,48 @@
 <!DOCTYPE configuration>

 <configuration>
-  <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
-  <import class="ch.qos.logback.classic.AsyncAppender"/>
-  <import class="ch.qos.logback.core.FileAppender"/>
-  <import class="ch.qos.logback.core.ConsoleAppender"/>
+    <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" />
+    <import class="ch.qos.logback.classic.AsyncAppender" />
+    <import class="ch.qos.logback.core.FileAppender" />
+    <import class="ch.qos.logback.core.ConsoleAppender" />

-  <appender name="FILE" class="FileAppender">
-    <file>${application.home:-.}/logs/application.log</file>
-    <encoder class="PatternLayoutEncoder">
-      <charset>UTF-8</charset>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
-    </encoder>
-  </appender>
+    <appender name="FILE" class="FileAppender">
+        <file>${application.home:-.}/logs/application.log</file>
+        <encoder class="PatternLayoutEncoder">
+            <charset>UTF-8</charset>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n
+            </pattern>
+        </encoder>
+    </appender>

-  <appender name="STDOUT" class="ConsoleAppender">
-    <!--
-         On Windows, enabling Jansi is recommended to benefit from color code interpretation on DOS command prompts,
-         which otherwise risk being sent ANSI escape sequences that they cannot interpret.
-         See https://logback.qos.ch/manual/layouts.html#coloring
-    -->
-    <!-- <withJansi>true</withJansi> -->
-    <encoder class="PatternLayoutEncoder">
-      <charset>UTF-8</charset>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
-    </encoder>
-  </appender>
+    <appender name="STDOUT" class="ConsoleAppender">
+        <!--
+             On Windows, enabling Jansi is recommended to benefit from color code interpretation on DOS command prompts,
+             which otherwise risk being sent ANSI escape sequences that they cannot interpret.
+             See https://logback.qos.ch/manual/layouts.html#coloring
+        -->
+        <!-- <withJansi>true</withJansi> -->
+        <encoder class="PatternLayoutEncoder">
+            <charset>UTF-8</charset>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n
+            </pattern>
+        </encoder>
+    </appender>

-  <appender name="ASYNCFILE" class="AsyncAppender">
-    <appender-ref ref="FILE"/>
-  </appender>
+    <appender name="ASYNCFILE" class="AsyncAppender">
+        <appender-ref ref="FILE" />
+    </appender>

-  <appender name="ASYNCSTDOUT" class="AsyncAppender">
-    <appender-ref ref="STDOUT"/>
-  </appender>
+    <appender name="ASYNCSTDOUT" class="AsyncAppender">
+        <appender-ref ref="STDOUT" />
+    </appender>

-  <logger name="play" level="INFO"/>
-  <logger name="application" level="DEBUG"/>
+    <logger name="play" level="INFO" />
+    <logger name="application" level="DEBUG" />

-  <root level="WARN">
-    <appender-ref ref="ASYNCFILE"/>
-    <appender-ref ref="ASYNCSTDOUT"/>
-  </root>
+    <root level="WARN">
+        <appender-ref ref="ASYNCFILE" />
+        <appender-ref ref="ASYNCSTDOUT" />
+    </root>

 </configuration>
--- a/knockoutwhistweb/conf/routes
+++ b/knockoutwhistweb/conf/routes
@@ -3,28 +3,28 @@
 # https://www.playframework.com/documentation/latest/ScalaRouting
 # ~~~~

-
+# For the javascript routing
+GET         /assets/js/routes        controllers.JavaScriptRoutingController.javascriptRoutes()
 # Primary routes
-GET     /                           controllers.MainMenuController.index()
-GET     /assets/*file               controllers.Assets.versioned(path="/public", file: Asset)
+GET         /                        controllers.MainMenuController.index()
+GET         /assets/*file            controllers.Assets.versioned(path="/public", file: Asset)

 # Main menu routes
-GET     /mainmenu                   controllers.MainMenuController.mainMenu()
-GET     /rules                      controllers.MainMenuController.rules()
+GET         /mainmenu                controllers.MainMenuController.mainMenu()
+GET         /rules                   controllers.MainMenuController.rules()
+GET         /navSPA/:pType           controllers.MainMenuController.navSPA(pType)

-POST    /createGame                 controllers.MainMenuController.createGame()
-POST    /joinGame                   controllers.MainMenuController.joinGame()
+POST        /createGame              controllers.MainMenuController.createGame()
+POST        /joinGame                controllers.MainMenuController.joinGame()

 # User authentication routes
-GET     /login                      controllers.UserController.login()
-POST    /login                      controllers.UserController.login_Post()
+GET         /login                   controllers.UserController.login()
+POST        /login                   controllers.UserController.login_Post()

-GET     /logout                     controllers.UserController.logout()
+GET         /logout                  controllers.UserController.logout()

 # In-game routes
-GET    /game/:id                    controllers.IngameController.game(id: String)
-GET    /game/:id/join               controllers.IngameController.joinGame(id: String)
-GET    /game/:id/start              controllers.IngameController.startGame(id: String)
-POST    /game/:id/kickPlayer         controllers.IngameController.kickPlayer(id: String, playerId: java.util.UUID)
-GET     /game/:id/leaveGame         controllers.IngameController.leaveGame(id: String)
-POST   /game/:id/playCard           controllers.IngameController.playCard(id: String)
+GET         /game/:id                controllers.IngameController.game(id: String)
+
+# Websocket
+GET         /websocket               controllers.WebsocketController.socket()
--- a/knockoutwhistweb/public/javascripts/main.js
+++ b/knockoutwhistweb/public/javascripts/main.js
@@ -77,4 +77,143 @@
                })
            })
    })
-})()
+})()
+
+function createGameJS() {
+    let lobbyName = $('#lobbyname').val();
+    if ($.trim(lobbyName) === "") {
+        lobbyName = "DefaultLobby"
+    }
+    const jsonObj = {
+        lobbyname: lobbyName,
+        playeramount: $("#playeramount").val()
+    }
+    sendGameCreationRequest(jsonObj);
+}
+
+function sendGameCreationRequest(dataObject) {
+    const route = jsRoutes.controllers.MainMenuController.createGame();
+
+    $.ajax({
+        url: route.url,
+        type: route.type,
+        contentType: 'application/json',
+        data: JSON.stringify(dataObject),
+        dataType: 'json',
+        success: (data => {
+            if (data.status === 'success') {
+                exchangeBody(data.content, "Knockout Whist - Lobby", data.redirectUrl);
+            }
+        }),
+        error: ((jqXHR) => {
+            const errorData = JSON.parse(jqXHR.responseText);
+            if (errorData && errorData.errorMessage) {
+                alert(`${errorData.errorMessage}`);
+            } else {
+                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
+            }
+        })
+    })
+}
+
+function exchangeBody(content, title = "Knockout Whist", url = null) {
+    if (url) {
+        window.history.pushState({}, title, url);
+    }
+    $("#main-body").html(content);
+    document.title = title;
+}
+
+function login() {
+    const username = $('#username').val();
+    const password = $('#password').val();
+
+    const jsonObj = {
+        username: username,
+        password: password
+    };
+
+    const route = jsRoutes.controllers.UserController.login_Post();
+    $.ajax({
+        url: route.url,
+        type: route.type,
+        contentType: 'application/json',
+        dataType: 'json',
+        data: JSON.stringify(jsonObj),
+        success: (data => {
+            if (data.status === 'success') {
+                exchangeBody(data.content, 'Knockout Whist - Create Game', data.redirectUrl);
+                return
+            }
+            alert('Login failed. Please check your credentials and try again.');
+        }),
+        error: ((jqXHR) => {
+            const errorData = JSON.parse(jqXHR.responseText);
+            if (errorData?.errorMessage) {
+                alert(`${errorData.errorMessage}`);
+            } else {
+                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
+            }
+        })
+    });
+}
+
+function joinGame() {
+    const gameId = $('#gameId').val();
+
+    const jsonObj = {
+        gameId: gameId
+    };
+
+    const route = jsRoutes.controllers.MainMenuController.joinGame();
+    $.ajax({
+        url: route.url,
+        type: route.type,
+        contentType: 'application/json',
+        dataType: 'json',
+        data: JSON.stringify(jsonObj),
+        success: (data => {
+            if (data.status === 'success') {
+                exchangeBody(data.content, "Knockout Whist - Lobby", data.redirectUrl);
+                return
+            }
+            alert('Could not join the game. Please check the Game ID and try again.');
+        }),
+        error: ((jqXHR) => {
+            const errorData = JSON.parse(jqXHR.responseText);
+            if (errorData?.errorMessage) {
+                alert(`${errorData.errorMessage}`);
+            } else {
+                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
+            }
+        })
+    });
+    return false
+}
+
+function navSpa(page, title) {
+    const route = jsRoutes.controllers.MainMenuController.navSPA(page);
+    $.ajax({
+        url: route.url,
+        type: route.type,
+        contentType: 'application/json',
+        dataType: 'json',
+        data: JSON.stringify(jsonObj),
+        success: (data => {
+            if (data.status === 'success') {
+                exchangeBody(data.content, title, data.redirectUrl);
+                return
+            }
+            alert('Could not join the game. Please check the Game ID and try again.');
+        }),
+        error: ((jqXHR) => {
+            const errorData = JSON.parse(jqXHR.responseText);
+            if (errorData?.errorMessage) {
+                alert(`${errorData.errorMessage}`);
+            } else {
+                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
+            }
+        })
+    });
+    return false
+}
--- a/knockoutwhistweb/public/javascripts/particles.js
+++ b/knockoutwhistweb/public/javascripts/particles.js
--- a/knockoutwhistweb/public/javascripts/websocket.js
+++ b/knockoutwhistweb/public/javascripts/websocket.js
@@ -0,0 +1,192 @@
+// javascript
+let ws = null; // will be created by connectWebSocket()
+const pending = new Map(); // id -> { resolve, reject, timer }
+const handlers = new Map(); // eventType -> handler(data) -> (value|Promise)
+
+
+let timer = null;
+
+// helper to attach message/error/close handlers to a socket
+function setupSocketHandlers(socket) {
+    socket.onmessage = (event) => {
+        console.debug("SERVER MESSAGE:", event.data);
+        let msg;
+        try {
+            msg = JSON.parse(event.data);
+        } catch (e) {
+            console.debug("Non-JSON message from server:", event.data, e);
+            return;
+        }
+
+        const id = msg.id;
+        const eventType = msg.event;
+        const status = msg.status;
+        const data = msg.data;
+
+        if (id && typeof status === "string") {
+            const entry = pending.get(id);
+            if (!entry) return;
+            clearTimeout(entry.timer);
+            pending.delete(id);
+
+            if (status === "success") {
+                entry.resolve(data === undefined ? {} : data);
+            } else {
+                entry.reject(new Error(msg.error || "Server returned error"));
+            }
+            return;
+        }
+
+        if (id && eventType) {
+            const handler = handlers.get(eventType);
+            const sendResponse = (respData) => {
+                const response = {id: id, event: eventType, data: respData === undefined ? {} : respData};
+                if (socket && socket.readyState === WebSocket.OPEN) {
+                    socket.send(JSON.stringify(response));
+                } else {
+                    console.warn("Cannot send response, websocket not open");
+                }
+            };
+
+            if (!handler) {
+                // no handler: respond with an error object in data so server can fail it
+                sendResponse({error: "No handler for event: " + eventType});
+                return;
+            }
+
+            try {
+                Promise.resolve(handler(data === undefined ? {} : data))
+                    .then(result => sendResponse(result))
+                    .catch(err => sendResponse({error: err?.message ? err.message : String(err)}));
+            } catch (err) {
+                sendResponse({error: err?.message ? err.message : String(err)});
+            }
+        }
+    };
+
+    socket.onerror = (error) => {
+        console.error("WebSocket Error:", error);
+        if (timer) clearInterval(timer);
+        for (const [id, entry] of pending.entries()) {
+            clearTimeout(entry.timer);
+            entry.reject(new Error("WebSocket error/closed"));
+            pending.delete(id);
+        }
+        if (socket.readyState === WebSocket.OPEN) socket.close(1000, "Unexpected error.");
+    };
+
+    socket.onclose = (event) => {
+        if (timer) clearInterval(timer);
+        for (const [id, entry] of pending.entries()) {
+            clearTimeout(entry.timer);
+            entry.reject(new Error("WebSocket closed"));
+            pending.delete(id);
+        }
+        if (event.wasClean) {
+            console.log(`Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+        } else {
+            console.warn('Connection died unexpectedly.');
+        }
+    };
+}
+
+// connect/disconnect helpers
+function connectWebSocket(url = "ws://localhost:9000/websocket") {
+    if (ws && ws.readyState === WebSocket.OPEN) return Promise.resolve();
+    if (ws && ws.readyState === WebSocket.CONNECTING) {
+        // already connecting - return a promise that resolves on open
+        return new Promise((resolve, reject) => {
+            const prevOnOpen = ws.onopen;
+            const prevOnError = ws.onerror;
+            ws.onopen = (ev) => {
+                if (prevOnOpen) prevOnOpen(ev);
+                resolve();
+            };
+            ws.onerror = (err) => {
+                if (prevOnError) prevOnError(err);
+                reject(err);
+            };
+        });
+    }
+
+    ws = new WebSocket(url);
+    setupSocketHandlers(ws);
+
+    return new Promise((resolve, reject) => {
+        ws.onopen = () => {
+            console.log("WebSocket connection established!");
+            // start heartbeat
+            timer = setInterval(() => {
+                if (ws && ws.readyState === WebSocket.OPEN) {
+                    sendEventAndWait("ping", {}).then(
+                        () => console.debug("PING RESPONSE RECEIVED"),
+                    ).catch(
+                        (err) => console.warn("PING ERROR:", err.message),
+                    );
+                    console.debug("PING SENT");
+                }
+            }, 5000);
+            resolve();
+        };
+
+        ws.onerror = (err) => {
+            reject(err);
+        };
+    });
+}
+
+function disconnectWebSocket(code = 1000, reason = "Client disconnect") {
+    if (timer) {
+        clearInterval(timer);
+        timer = null;
+    }
+    if (ws) {
+        try {
+            ws.close(code, reason);
+        } catch (e) {
+        }
+        ws = null;
+    }
+}
+
+function sendEvent(eventType, eventData) {
+    if (!ws || ws.readyState !== WebSocket.OPEN) {
+        console.warn("WebSocket is not open. Unable to send message.");
+        return;
+    }
+    const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 9);
+    const message = {id: id, event: eventType, data: eventData};
+    ws.send(JSON.stringify(message));
+    console.debug("SENT:", message);
+}
+
+function sendEventAndWait(eventType, eventData, timeoutMs = 10000) {
+    if (!ws || ws.readyState !== WebSocket.OPEN) {
+        return Promise.reject(new Error("WebSocket is not open"));
+    }
+    const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 9);
+    const message = {id: id, event: eventType, data: eventData};
+    const p = new Promise((resolve, reject) => {
+        const timerId = setTimeout(() => {
+            if (pending.has(id)) {
+                pending.delete(id);
+                reject(new Error(`No response within ${timeoutMs}ms for id=${id}`));
+            }
+        }, timeoutMs);
+        pending.set(id, {resolve, reject, timer: timerId});
+    });
+    ws.send(JSON.stringify(message));
+    console.debug("SENT (await):", message);
+    return p;
+}
+
+function onEvent(eventType, handler) {
+    handlers.set(eventType, handler);
+}
+
+globalThis.sendEvent = sendEvent;
+globalThis.sendEventAndWait = sendEventAndWait;
+globalThis.onEvent = onEvent;
+globalThis.connectWebSocket = connectWebSocket;
+globalThis.disconnectWebSocket = disconnectWebSocket;
+globalThis.isWebSocketConnected = () => !!ws && ws.readyState === WebSocket.OPEN;
--- a/knockoutwhistweb/test/controllers/HomeControllerSpec.scala
+++ b/knockoutwhistweb/test/controllers/HomeControllerSpec.scala
@@ -13,33 +13,33 @@ import play.api.test.Helpers.*
 */
 class HomeControllerSpec extends PlaySpec with GuiceOneAppPerTest with Injecting {

-//  "HomeController GET" should {
-//
-//    "render the index page from a new instance of controller" in {
-//      val controller = new HomeController(stubControllerComponents())
-//      val home = controller.index().apply(FakeRequest(GET, "/"))
-//
-//      status(home) mustBe OK
-//      contentType(home) mustBe Some("text/html")
-//      contentAsString(home) must include ("Welcome to Play")
-//    }
-//
-//    "render the index page from the application" in {
-//      val controller = inject[HomeController]
-//      val home = controller.index().apply(FakeRequest(GET, "/"))
-//
-//      status(home) mustBe OK
-//      contentType(home) mustBe Some("text/html")
-//      contentAsString(home) must include ("Welcome to Play")
-//    }
-//
-//    "render the index page from the router" in {
-//      val request = FakeRequest(GET, "/")
-//      val home = route(app, request).get
-//
-//      status(home) mustBe OK
-//      contentType(home) mustBe Some("text/html")
-//      contentAsString(home) must include ("Welcome to Play")
-//    }
-//  }
+  //  "HomeController GET" should {
+  //
+  //    "render the index page from a new instance of controller" in {
+  //      val controller = new HomeController(stubControllerComponents())
+  //      val home = controller.index().apply(FakeRequest(GET, "/"))
+  //
+  //      status(home) mustBe OK
+  //      contentType(home) mustBe Some("text/html")
+  //      contentAsString(home) must include ("Welcome to Play")
+  //    }
+  //
+  //    "render the index page from the application" in {
+  //      val controller = inject[HomeController]
+  //      val home = controller.index().apply(FakeRequest(GET, "/"))
+  //
+  //      status(home) mustBe OK
+  //      contentType(home) mustBe Some("text/html")
+  //      contentAsString(home) must include ("Welcome to Play")
+  //    }
+  //
+  //    "render the index page from the router" in {
+  //      val request = FakeRequest(GET, "/")
+  //      val home = route(app, request).get
+  //
+  //      status(home) mustBe OK
+  //      contentType(home) mustBe Some("text/html")
+  //      contentAsString(home) must include ("Welcome to Play")
+  //    }
+  //  }
 }
--- a/versions.env
+++ b/versions.env
@@ -1,3 +1,3 @@
-MAJOR=1
+MAJOR=4
 MINOR=0
-PATCH=8
+PATCH=1
Author	SHA1	Message	Date
TeamCity	10a26404b3	ci: bump version to v4.0.1	2025-11-24 11:21:05 +00:00
TeamCity	11478a096d	ci: bump version to v4.0.0	2025-11-23 15:15:09 +00:00
Janis	8ca909db52	feat(websocket)!: Implement WebSocket connection and event handling (#82 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #82 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-23 16:11:46 +01:00
TeamCity	1edb3bfd89	ci: bump version to v3.0.1	2025-11-22 20:38:51 +00:00
Janis	9738a04b7a	fix(api): Fixed a bug where the game would reload on game start (#81 ) Reviewed-on: #81 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-22 21:36:23 +01:00
TeamCity	2bc50664e0	ci: bump version to v3.0.0	2025-11-20 15:31:03 +00:00
Janis	3e3a062a06	ci: bump version to v2.0.0	2025-11-20 16:27:39 +01:00
Janis	641c892981	fix(polling): Improve polling mechanism and delay handling (#60 ) Reviewed-on: #60	2025-11-20 10:51:39 +01:00
Janis	a58b2e03b1	feat(game)!: Fixed polling, SPA, Gameplayloop etc. (#59 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #59 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-19 22:54:20 +01:00
Janis	e60fe7c98d	feat(ci): Polling Added polling for when the game starts and a card gets played (#58 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #58	2025-11-14 09:11:32 +01:00
Janis	370de175db	feat(ci): Polling Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #53	2025-11-13 11:07:08 +01:00
Janis	5d245d0011	feat(ui): implement tie & trump menu, fixed some critical bugs (#52 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #52 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-13 08:20:30 +01:00
lq64	c220e54bb8	feat(ui): added js routing, updated ingame ui, added tricktable (#50 ) This merge request has full JS routing for calling specific endpoints. Game is fully playable but doesn't have polling yet. This version already has the UI changes adressed in MR #43 so first merge MR #43 and then this one or only merge this one because it already has the UI changes :) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #50 Reviewed-by: Janis <janis-e@gmx.de>	2025-11-12 11:44:21 +01:00
TeamCity	b847d3c054	ci: bump version to v1.0.9	2025-11-07 16:54:36 +00:00
Janis	c7dd72ecc2	fix: removed trailing	2025-11-07 17:52:12 +01:00
Janis	42a5adbae0	fix: removed trailing	2025-11-07 17:46:55 +01:00