ci: bump version to v1.1.0

CHANGELOG.md

@@ -111,46 +111,11 @@
 
 * 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)
+##  (2025-11-14)
-
-### ⚠ 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)
-##  (2025-11-26)
-
-### Features
-
-* **api:** Implement received hand event handling and UI updates ([#83](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/83)) ([52e5033](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/52e5033afca344ae40a644196555a9655913710a)), closes [#76](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/76)
-* **base:** Fixed logic for websockets and added GameStateEvent. Might've caused instability on other feature branches! ([#84](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/84)) ([b81bb3d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b81bb3d0aeb8500a9d7417a10e24e7f8a17d71d2))
-##  (2025-11-26)
-
-### Features
-
-* **api:** Implemented card played event via websocket ([#85](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/85)) ([3c0828f](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/3c0828fdbeb507706b86f1662476c46e760533e4))

build.sbt

@@ -1,12 +1,12 @@
 ThisBuild / scalaVersion := "3.5.1"
 
 lazy val commonSettings = Seq(
-  libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.19",
+  libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.18",
-  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % "test",
+  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.18" % "test",
-  libraryDependencies += "io.github.mkpaz" % "atlantafx-base" % "2.1.0",
+  libraryDependencies += "io.github.mkpaz" % "atlantafx-base" % "2.0.1",
-  libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.2-R36",
+  libraryDependencies += "org.scalafx" %% "scalafx" % "22.0.0-R33",
-  libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.4.0",
+  libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.3.0",
-  libraryDependencies += "org.playframework" %% "play-json" % "3.1.0-M9",
+  libraryDependencies += "org.playframework" %% "play-json" % "3.1.0-M1",
   libraryDependencies ++= {
     // Determine OS version of JavaFX binaries
     lazy val osName = System.getProperty("os.name") match {
@@ -38,9 +38,8 @@ 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.5.0",
+    libraryDependencies += "com.auth0" % "java-jwt" % "4.3.0",
-    libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.3",
+    libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.2",
-    libraryDependencies += "tools.jackson.module" %% "jackson-module-scala" % "3.0.2",
     JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
   )
 

knockoutwhistweb/app/assets/stylesheets/main.less

@@ -14,18 +14,13 @@
   --bs-border-color: rgba(0, 0, 0, 0.125) !important;
   --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% {
+  0% { transform: translateX(-100vw); }
-    transform: translateX(-100vw);
+  100% { transform: translateX(0); }
-  }
-  100% {
-    transform: translateX(0);
-  }
 }
 
 .game-field-background {
@@ -36,7 +31,6 @@
     margin: 0 auto;
     min-height: 100vh;
 }
-
 .lobby-background {
     background-color: @background-color;
     width: 100%;
@@ -51,21 +45,10 @@
     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;
@@ -112,13 +95,11 @@ body {
     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;
@@ -130,7 +111,6 @@ body {
     font-size: 40px;
     font-family: Arial, serif;
 }
-
 #ingame {
     display: flex;
     flex-direction: column;
@@ -138,7 +118,6 @@ body {
     justify-content: flex-end;
     height: 100%;
 }
-
 #ingame a, #ingame h1, #ingame p {
     color: @color;
     font-size: 40px;
@@ -149,34 +128,13 @@ body {
   div {
     animation: slideIn 0.5s ease-out forwards;
     animation-fill-mode: backwards;
-
+    &:nth-child(1) { animation-delay: 0.5s; }
-    &:nth-child(1) {
+    &:nth-child(2) { animation-delay: 1s; }
-      animation-delay: 0.5s;
+    &:nth-child(3) { animation-delay: 1.5s; }
-    }
+    &:nth-child(4) { animation-delay: 2s; }
-
+    &:nth-child(5) { animation-delay: 2.5s; }
-    &:nth-child(2) {
+    &:nth-child(6) { animation-delay: 3s; }
-      animation-delay: 1s;
+    &:nth-child(7) { animation-delay: 3.5s; }
-    }
-
-    &: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;
-    }
   }
 }
 
@@ -185,12 +143,10 @@ body {
     flex-direction: column;
     justify-content: flex-end;
 }
-
 #playedcardplayer p {
     font-size: 12px;
     height: 4%;
 }
-
 #playedcardplayer img {
     height: 90%;
 }
@@ -202,52 +158,43 @@ body {
     width: 100%;
     justify-content: space-between;
 }
-
 #firstCardObject {
     display: flex;
     flex-direction: column;
     margin-right: 4%;
 }
-
 #firstCardObject img{
     height: 90%;
 }
-
 #firstCardObject p{
     height: 10%;
     font-size: 20px;
 
 }
-
 #nextPlayers {
     display: flex;
     flex-direction: column;
     align-items: center;
     height: 0;
-
     p {
         margin-top: 0;
         margin-bottom: 0;
     }
 }
-
 #invisible {
     visibility: hidden;
 }
-
 #selecttrumpsuit {
     display: flex;
     flex-direction: column;
     align-items: center;
     height: 100%;
 }
-
 #rules {
     color: @color;
     font-size: 1.5em;
     font-family: Arial, serif;
 }
-
 .score-table {
     background-color: rgba(255, 255, 255, 0.1);
     border-radius: 8px;
@@ -256,13 +203,11 @@ body {
     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;
 }

knockoutwhistweb/app/auth/AuthAction.scala

@@ -15,6 +15,13 @@ 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]
@@ -26,12 +33,5 @@ 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
-  }
 }
 

knockoutwhistweb/app/components/WebApplicationConfiguration.scala

@@ -2,13 +2,11 @@ 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)
 
 }

knockoutwhistweb/app/controllers/IngameController.scala

@@ -1,17 +1,14 @@
 package controllers
 
 import auth.{AuthAction, AuthenticatedRequest}
-import de.knockoutwhist.control.GameState
+import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak}
-import de.knockoutwhist.control.GameState.*
 import exceptions.*
 import logic.PodManager
 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.*
@@ -21,29 +18,40 @@ import scala.util.Try
 @Singleton
 class IngameController @Inject() (
                                    val cc: ControllerComponents,
+                                   val podManager: PodManager,
                                    val authAction: AuthAction,
                                    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) =>
-        val results = Try {
+        g.logic.getCurrentState match {
-          IngameController.returnInnerHTML(g, g.logic.getCurrentState, request.user)
+          case Lobby => Ok(views.html.lobby.lobby(Some(request.user), g))
-        }
+          case InGame =>
-        if (results.isSuccess) {
+            Ok(views.html.ingame.ingame(
-          Ok(views.html.main("In-Game - Knockout Whist")(results.get))
+              g.getPlayerByUser(request.user),
-        } else {
+              g
-          InternalServerError(results.failed.get.getMessage)
+            ))
+          case SelectTrump =>
+            Ok(views.html.ingame.selecttrump(
+              g.getPlayerByUser(request.user),
+              g
+            ))
+          case TieBreak =>
+            Ok(views.html.ingame.tie(
+              g.getPlayerByUser(request.user),
+              g
+            ))
+          case _ =>
+            InternalServerError(s"Invalid game state for in-game view. GameId: $gameId" + s" State: ${g.logic.getCurrentState}")
         }
       case None =>
-        Redirect(routes.MainMenuController.mainMenu())
+        NotFound("Game not found")
     }
   }
-
   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) =>
@@ -55,8 +63,7 @@ class IngameController @Inject()(
     if (result.isSuccess) {
       Ok(Json.obj(
         "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameId).url,
+        "redirectUrl" -> routes.IngameController.game(gameId).url
-        "content" -> IngameController.returnInnerHTML(game.get, game.get.logic.getCurrentState, request.user).toString()
       ))
     } else {
       val throwable = result.failed.get
@@ -84,9 +91,8 @@ class IngameController @Inject()(
       }
     }
   }
-
   def kickPlayer(gameId: String, playerToKick: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
     val playerToKickUUID = UUID.fromString(playerToKick)
     val result = Try {
       game.get.leaveGame(playerToKickUUID)
@@ -103,17 +109,15 @@ class IngameController @Inject()(
       ))
     }
   }
-
   def leaveGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
+    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,
+        "redirectUrl" -> routes.MainMenuController.mainMenu().url
-        "content" -> views.html.mainmenu.creategame(Some(request.user)).toString
       ))
     } else {
       InternalServerError(Json.obj(
@@ -122,9 +126,34 @@ class IngameController @Inject()(
       ))
     }
   }
-
+  def joinGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = podManager.getGame(gameId)
+    val result = Try {
+      game match {
+        case Some(g) =>
+          g.addUser(request.user)
+        case None =>
+          NotFound("Game not found")
+      }
+    }
+    if (result.isSuccess) {
+      Redirect(routes.IngameController.game(gameId))
+    } 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)
+      }
+    }
+  }
   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 jsonBody = request.body.asJson
@@ -143,7 +172,8 @@ class IngameController @Inject()(
             optSession.foreach(_.lock.unlock())
             if (result.isSuccess) {
               Ok(Json.obj(
-                "status" -> "success"
+                "status" -> "success",
+                "redirectUrl" -> routes.IngameController.game(gameId).url
               ))
             } else {
               val throwable = result.failed.get
@@ -168,11 +198,6 @@ class IngameController @Inject()(
                     "status" -> "failure",
                     "errorMessage" -> throwable.getMessage
                   ))
-                case _: NotInteractableException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
                 case _ =>
                   InternalServerError(Json.obj(
                     "status" -> "failure",
@@ -194,15 +219,11 @@ class IngameController @Inject()(
     }
   }
   }
-
   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 jsonBody = request.body.asJson
+        val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
-        val cardIdOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "cardID").asOpt[String]
-        }
         var optSession: Option[UserSession] = None
         val result = Try {
           cardIdOpt match {
@@ -227,30 +248,15 @@ class IngameController @Inject()(
           val throwable = result.failed.get
           throwable match {
             case _: CantPlayCardException =>
-              BadRequest(Json.obj(
+              BadRequest(throwable.getMessage)
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
             case _: NotInThisGameException =>
-              BadRequest(Json.obj(
+              BadRequest(throwable.getMessage)
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
             case _: IllegalArgumentException =>
-              BadRequest(Json.obj(
+              BadRequest(throwable.getMessage)
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
             case _: IllegalStateException =>
-              BadRequest(Json.obj(
+              BadRequest(throwable.getMessage)
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
             case _ =>
-              InternalServerError(Json.obj(
+              InternalServerError(throwable.getMessage)
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
           }
         }
       }
@@ -259,15 +265,11 @@ 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 jsonBody = request.body.asJson
+        val trumpOpt = request.body.asFormUrlEncoded.flatMap(_.get("trump").flatMap(_.headOption))
-        val trumpOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "trump").asOpt[String]
-        }
         trumpOpt match {
           case Some(trump) =>
             var optSession: Option[UserSession] = None
@@ -284,25 +286,13 @@ class IngameController @Inject()(
               val throwable = result.failed.get
               throwable match {
                 case _: IllegalArgumentException =>
-                  BadRequest(Json.obj(
+                  BadRequest(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
                 case _: NotInThisGameException =>
-                  BadRequest(Json.obj(
+                  BadRequest(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
                 case _: IllegalStateException =>
-                  BadRequest(Json.obj(
+                  BadRequest(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
                 case _ =>
-                  InternalServerError(Json.obj(
+                  InternalServerError(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
               }
             }
           case None =>
@@ -312,15 +302,11 @@ 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 jsonBody = request.body.asJson
+        val tieOpt = request.body.asFormUrlEncoded.flatMap(_.get("tie").flatMap(_.headOption))
-        val tieOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "tie").asOpt[String]
-        }
         tieOpt match {
           case Some(tie) =>
             var optSession: Option[UserSession] = None
@@ -337,25 +323,13 @@ class IngameController @Inject()(
               val throwable = result.failed.get
               throwable match {
                 case _: IllegalArgumentException =>
-                  BadRequest(Json.obj(
+                  BadRequest(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
                 case _: NotInThisGameException =>
-                  BadRequest(Json.obj(
+                  BadRequest(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
                 case _: IllegalStateException =>
-                  BadRequest(Json.obj(
+                  BadRequest(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
                 case _ =>
-                  InternalServerError(Json.obj(
+                  InternalServerError(throwable.getMessage)
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
               }
             }
           case None =>
@@ -366,78 +340,4 @@ 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"
-        ))
-    }
-  }
-  
-}
-
-object IngameController {
-
-  def returnInnerHTML(gameLobby: GameLobby, gameState: GameState, user: User): Html = {
-    gameState 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}")
-    }
-  }
-  
 }

knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala

@@ -1,6 +1,7 @@
 package controllers
 
-import auth.AuthAction
+import auth.{AuthAction, AuthenticatedRequest}
+import logic.PodManager
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import play.api.routing.JavaScriptReverseRouter
 
@@ -9,15 +10,17 @@ import javax.inject.Inject
 class JavaScriptRoutingController  @Inject()(
                                               val controllerComponents: ControllerComponents,
                                               val authAction: AuthAction,
+                                              val podManager: PodManager
                                             ) extends BaseController {
-  def javascriptRoutes(): Action[AnyContent] =
+  def javascriptRoutes(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    Action { implicit request =>
     Ok(
       JavaScriptReverseRouter("jsRoutes")(
           routes.javascript.MainMenuController.createGame,
-          routes.javascript.MainMenuController.joinGame,
+          routes.javascript.IngameController.startGame,
-          routes.javascript.MainMenuController.navSPA,
+          routes.javascript.IngameController.kickPlayer,
-          routes.javascript.UserController.login_Post
+          routes.javascript.IngameController.leaveGame,
+          routes.javascript.IngameController.playCard,
+          routes.javascript.PollingController.polling
       )
     ).as("text/javascript")
   }

knockoutwhistweb/app/controllers/MainMenuController.scala

@@ -16,12 +16,13 @@ import javax.inject.*
 @Singleton
 class MainMenuController @Inject()(
                                     val controllerComponents: ControllerComponents,
-                                    val authAction: AuthAction
+                                    val authAction: AuthAction,
+                                    val podManager: PodManager
                                   ) 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.main("Knockout Whist - Create Game")(views.html.mainmenu.creategame(Some(request.user))))
+    Ok(views.html.mainmenu.creategame(Some(request.user)))
   }
 
   def index(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
@@ -37,15 +38,14 @@ class MainMenuController @Inject()(
       val playeramount: String = (jsonBody.get \ "playeramount").asOpt[String]
         .getOrElse(throw new IllegalArgumentException("Player amount is required."))
 
-      val gameLobby = PodManager.createGame(
+      val gameLobby = podManager.createGame(
         host = request.user,
         name = gamename,
         maxPlayers = playeramount.toInt
       )
       Ok(Json.obj(
         "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameLobby.id).url,
+        "redirectUrl" -> routes.IngameController.game(gameLobby.id).url
-        "content" -> IngameController.returnInnerHTML(gameLobby, gameLobby.logic.getCurrentState, request.user).toString
       ))
     } else {
       BadRequest(Json.obj(
@@ -57,58 +57,22 @@ class MainMenuController @Inject()(
   }
   
   def joinGame(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val jsonBody = request.body.asJson
+    val postData = request.body.asFormUrlEncoded
-    val gameId: Option[String] = jsonBody.flatMap { jsValue =>
+    if (postData.isDefined) {
-      (jsValue \ "gameId").asOpt[String]
+      val gameId = postData.get.get("gameId").flatMap(_.headOption).getOrElse("")
-    }
+      val game = podManager.getGame(gameId)
-    if (gameId.isDefined) {
-      val game = PodManager.getGame(gameId.get)
       game match {
         case Some(g) =>
-          g.addUser(request.user)
+          Redirect(routes.IngameController.joinGame(gameId))
-          Ok(Json.obj(
-            "status" -> "success",
-            "redirectUrl" -> routes.IngameController.game(g.id).url,
-            "content" -> IngameController.returnInnerHTML(g, g.logic.getCurrentState, request.user).toString
-          ))
         case None =>
-          NotFound(Json.obj(
+          NotFound("Game not found")
-            "status" -> "failure",
-            "errorMessage" -> "No Game found"
-          ))
       }
     } else {
-      BadRequest(Json.obj(
+      BadRequest("Invalid form submission")
-        "status" -> "failure",
-        "errorMessage" -> "Invalid form submission"
-      ))
     }
   }
 
   def rules(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    Ok(views.html.main("Knockout Whist - Rules")(views.html.mainmenu.rules(Some(request.user))))
+    Ok(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"
-        ))
   }
 }
-
-}

knockoutwhistweb/app/controllers/PollingController.scala

@@ -0,0 +1,134 @@
+package controllers
+
+import auth.{AuthAction, AuthenticatedRequest}
+import de.knockoutwhist.cards.Hand
+import logic.PodManager
+import logic.game.{GameLobby, PollingEvents}
+import logic.game.PollingEvents.{CardPlayed, LobbyUpdate, NewRound, ReloadEvent}
+import model.sessions.UserSession
+import model.users.User
+import play.api.libs.json.{JsArray, JsValue, Json}
+import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents, Result}
+import util.WebUIUtils
+
+import javax.inject.{Inject, Singleton}
+import scala.concurrent.{ExecutionContext, Future}
+
+@Singleton
+class PollingController @Inject() (
+                                    val cc: ControllerComponents,
+                                    val podManager: PodManager,
+                                    val authAction: AuthAction,
+                                    implicit val ec: ExecutionContext
+                                  ) extends AbstractController(cc) {
+
+  private def buildCardPlayResponse(game: GameLobby, hand: Option[Hand], newRound: Boolean): JsValue = {
+    val currentRound = game.logic.getCurrentRound.get
+    val currentTrick = game.logic.getCurrentTrick.get
+
+    val trickCardsJson = Json.toJson(
+      currentTrick.cards.map { case (card, player) =>
+        Json.obj("cardId" -> WebUIUtils.cardtoString(card), "player" -> player.name)
+      }
+    )
+    val scoreTableJson = Json.toJson(
+      game.getLogic.getPlayerQueue.get.toList.map { player =>
+        Json.obj(
+          "name" -> player.name,
+          "tricks" -> currentRound.tricklist.count(_.winner.contains(player))
+        )
+      }
+    )
+
+    val stringHand = hand.map { h =>
+      val cardStrings = h.cards.map(WebUIUtils.cardtoString)
+      Json.toJson(cardStrings).as[JsArray]
+    }.getOrElse(Json.arr())
+
+    val firstCardId = currentTrick.firstCard.map(WebUIUtils.cardtoString).getOrElse("BLANK")
+    val nextPlayer = game.getLogic.getPlayerQueue.get.duplicate().nextPlayer().name
+    Json.obj(
+      "status" -> "cardPlayed",
+      "animation" -> newRound,
+      "handData" -> stringHand,
+      "currentPlayerName" -> game.logic.getCurrentPlayer.get.name,
+      "trumpSuit" -> currentRound.trumpSuit.toString,
+      "trickCards" -> trickCardsJson,
+      "scoreTable" -> scoreTableJson,
+      "firstCardId" -> firstCardId,
+      "nextPlayer" -> nextPlayer
+    )
+  }
+
+  private def buildLobbyUsersResponse(game: GameLobby, userSession: UserSession): JsValue = {
+    Json.obj(
+      "status" -> "lobbyUpdate",
+      "host" ->  userSession.host,
+      "users" -> game.getUsers.map(u => Json.obj(
+        "name" -> u.name,
+        "id" -> u.id,
+        "self" -> (u.id == userSession.id)
+      ))
+    )
+  }
+
+
+  def handleEvent(event: PollingEvents, game: GameLobby, userSession: UserSession): Result = {
+    event match {
+      case NewRound =>
+        val player = game.getPlayerByUser(userSession.user)
+        val hand = player.currentHand()
+        val jsonResponse = buildCardPlayResponse(game, hand, true)
+        Ok(jsonResponse)
+      case CardPlayed =>
+        val player = game.getPlayerByUser(userSession.user)
+        val hand = player.currentHand()
+        val jsonResponse = buildCardPlayResponse(game, hand, false)
+        Ok(jsonResponse)
+      case LobbyUpdate =>
+        Ok(buildLobbyUsersResponse(game, userSession))
+      case ReloadEvent =>
+        val jsonResponse = Json.obj(
+          "status" -> "reloadEvent",
+          "redirectUrl" -> routes.IngameController.game(game.id).url
+        )
+        Ok(jsonResponse)
+    }
+  }
+
+  // --- Main Polling Action ---
+  def polling(gameId: String): Action[AnyContent] = authAction.async { implicit request: AuthenticatedRequest[AnyContent] =>
+
+    val playerId = request.user.id
+
+    // 1. Safely look up the game
+    podManager.getGame(gameId) match {
+      case Some(game) =>
+
+        // 2. Short-Poll Check (Check for missed events)
+        if (game.getPollingState.nonEmpty) {
+          val event = game.getPollingState.dequeue()
+
+          Future.successful(handleEvent(event, game, game.getUserSession(playerId)))
+        } else {
+
+          val eventPromise = game.registerWaiter(playerId)
+
+          eventPromise.future.map { event =>
+            game.removeWaiter(playerId)
+            handleEvent(event, game, game.getUserSession(playerId))
+          }.recover {
+            case _: Throwable =>
+              game.removeWaiter(playerId)
+              NoContent
+          }
+        }
+
+      case None =>
+        // Game not found
+        Future.successful(NotFound("Game not found."))
+    }
+  }
+
+
+}

knockoutwhistweb/app/controllers/UserController.scala

@@ -3,7 +3,6 @@ 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.*
@@ -29,35 +28,28 @@ class UserController @Inject()(
         if (possibleUser.isDefined) {
           Redirect(routes.MainMenuController.mainMenu())
         } else {
-          Ok(views.html.main("Login")(views.html.login.login()))
+          Ok(views.html.login.login())
         }
       } else {
-        Ok(views.html.main("Login")(views.html.login.login()))
+        Ok(views.html.login.login())
       }
     }
   }
 
   def login_Post(): Action[AnyContent] = {
     Action { implicit request =>
-      val jsonBody = request.body.asJson
+      val postData = request.body.asFormUrlEncoded
-      val username: Option[String] = jsonBody.flatMap { jsValue =>
+      if (postData.isDefined) {
-        (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 possibleUser = userManager.authenticate(username.get, password.get)
+        val username = postData.get.get("username").flatMap(_.headOption).getOrElse("")
+        val password = postData.get.get("password").flatMap(_.headOption).getOrElse("")
+        val possibleUser = userManager.authenticate(username, password)
         if (possibleUser.isDefined) {
-          Ok(Json.obj(
+          Redirect(routes.MainMenuController.mainMenu()).withCookies(
-            "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 {

knockoutwhistweb/app/controllers/WebsocketController.scala

@@ -1,45 +0,0 @@
-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))
-    }
-  }
-
-
-}

knockoutwhistweb/app/logic/PodManager.scala

@@ -11,14 +11,14 @@ import util.GameUtil
 import javax.inject.Singleton
 import scala.collection.mutable
 
-object PodManager {
+@Singleton
+class 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(
@@ -35,7 +35,6 @@ object PodManager {
       host = host
     )
     sessions += (gameLobby.id -> gameLobby)
-    userSession += (host -> gameLobby.id)
     gameLobby
   }
 
@@ -43,31 +42,8 @@ object PodManager {
     sessions.get(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)
   }
 
-
 }

knockoutwhistweb/app/logic/game/GameLobby.scala

@@ -2,23 +2,23 @@ package logic.game
 
 import de.knockoutwhist.cards.{Hand, Suit}
 import de.knockoutwhist.control.GameLogic
-import de.knockoutwhist.control.GameState.{Lobby, MainMenu}
+import de.knockoutwhist.control.GameState.{InGame, Lobby, MainMenu}
 import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.{MatchUtil, PlayerUtil}
-import de.knockoutwhist.events.global.{GameStateChangeEvent, SessionClosed}
+import de.knockoutwhist.events.global.{CardPlayedEvent, GameStateChangeEvent, SessionClosed}
-import de.knockoutwhist.events.player.PlayerEvent
+import de.knockoutwhist.events.player.{PlayerEvent, ReceivedHandEvent}
 import de.knockoutwhist.player.Playertype.HUMAN
 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 logic.game.PollingEvents.{CardPlayed, LobbyUpdate, NewRound, ReloadEvent}
 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
+import scala.concurrent.Promise as ScalaPromise
 
 class GameLobby private(
                  val logic: GameLogic,
@@ -27,44 +27,73 @@ class GameLobby private(
                  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()
+  private val pollingState: mutable.Queue[PollingEvents] = mutable.Queue()
+  private val waitingPromises: mutable.Map[UUID, ScalaPromise[PollingEvents]] = mutable.Map()
+
+  def registerWaiter(playerId: UUID): ScalaPromise[PollingEvents] = {
+    val promise = ScalaPromise[PollingEvents]()
+    waitingPromises.put(playerId, promise)
+    promise
+  }
+
+  def removeWaiter(playerId: UUID): Unit = {
+    waitingPromises.remove(playerId)
+  }
+
   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)
+    addToQueue(LobbyUpdate)
-    //TODO : transmit Lobby Update transmitToAll()
     userSession
   }
 
   override def listen(event: SimpleEvent): Unit = {
     event match {
+      case event: ReceivedHandEvent =>
+        addToQueue(NewRound)
+        users.get(event.playerId).foreach(session => session.updatePlayer(event))
+      case event: CardPlayedEvent =>
+        addToQueue(CardPlayed)
       case event: PlayerEvent =>
         users.get(event.playerId).foreach(session => session.updatePlayer(event))
       case event: GameStateChangeEvent =>
         if (event.oldState == MainMenu && event.newState == Lobby) {
           return
         }
+        if (event.oldState == Lobby && event.newState == InGame) {
+          addToQueue(ReloadEvent)
+        }else {
+          addToQueue(ReloadEvent)
+        }
+        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))
     }
   }
 
+  private def addToQueue(event: PollingEvents): Unit = {
+    if (waitingPromises.nonEmpty) {
+      waitingPromises.values.foreach(_.success(event))
+      waitingPromises.clear()
+    } else {
+      pollingState.enqueue(event)
+    }
+  }
+
   /**
    * Start the game if the user is the host.
-   *
    * @param user the user who wants to start the game.
    */
   def startGame(user: User): Unit = {
@@ -91,7 +120,6 @@ 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 = {
@@ -99,27 +127,12 @@ 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)
+    addToQueue(LobbyUpdate)
-    //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.
    */
@@ -137,6 +150,95 @@ 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
+  }
+  def getPollingState: mutable.Queue[PollingEvents] = {
+    pollingState
+  }
+  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) {
@@ -145,6 +247,14 @@ 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
     if (roundOpt.isEmpty) {
@@ -161,127 +271,10 @@ 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 {
@@ -302,8 +295,7 @@ object GameLobby {
     )
     lobby.users += (host.id -> new UserSession(
       user = host,
-      host = true,
+      host = true
-      gameLobby = lobby
     ))
     lobby
   }

knockoutwhistweb/app/logic/game/PollingEvents.scala

@@ -0,0 +1,8 @@
+package logic.game
+
+enum PollingEvents {
+  case CardPlayed
+  case NewRound
+  case ReloadEvent
+  case LobbyUpdate
+}

knockoutwhistweb/app/logic/user/SessionManager.scala

@@ -8,9 +8,7 @@ import model.users.User
 trait SessionManager {
   
   def createSession(user: User): String
-
   def getUserBySession(sessionId: String): Option[User]
-
   def invalidateSession(sessionId: String): Unit
 
 }

knockoutwhistweb/app/logic/user/UserManager.scala

@@ -8,13 +8,9 @@ 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
 
 }

knockoutwhistweb/app/model/sessions/PlayerSession.scala

@@ -7,9 +7,7 @@ import java.util.UUID
 trait PlayerSession {
   
   def id: UUID
-
   def name: String
-
   def updatePlayer(event: SimpleEvent): Unit
   
 }

knockoutwhistweb/app/model/sessions/UserSession.scala

@@ -2,18 +2,14 @@ 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.ReentrantLock
+import java.util.concurrent.locks.{Lock, ReentrantLock}
-import scala.util.Try
 
-class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) extends PlayerSession {
+class UserSession(val user: User, val host: Boolean) extends PlayerSession {
-  val lock: ReentrantLock = ReentrantLock()
   var canInteract: Option[InteractionType] = None
-  var websocketActor: Option[UserWebsocketActor] = None
+  val lock: ReentrantLock = ReentrantLock()
 
   override def updatePlayer(event: SimpleEvent): Unit = {
     event match {
@@ -26,7 +22,6 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
         else canInteract = Some(InteractionType.Card)
       case _ =>
     }
-    websocketActor.foreach(_.transmitEventToClient(event))
   }
 
   override def id: UUID = user.id
@@ -37,16 +32,4 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
     canInteract = None
   }
   
-  def handleWebResponse(eventType: String, data: JsObject): Unit = {
-    lock.lock()
-    Try {
-      eventType match {
-        case "Ping" =>
-          // No action needed for Ping
-          ()
-      }
-    }
-    lock.unlock()
-  }
-
 }

knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala

@@ -1,103 +0,0 @@
-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 {
-
-  {
-    session.lock.lock()
-    if (session.websocketActor.isDefined) {
-      val otherWebsocket = session.websocketActor.get
-      otherWebsocket.transmitTextToClient("Error: Multiple websocket connections detected. Closing your connection.")
-      context.stop(otherWebsocket.self)
-      transmitTextToClient("Previous websocket connection closed. You are now connected.")
-    }
-    session.websocketActor = Some(this)
-    session.lock.unlock()
-  }
-
-
-  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 statusOpt = (json \ "status").asOpt[String]
-    if (statusOpt.isDefined) {
-      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: JsValue): Unit = {
-    transmitTextToClient(jsonObj.toString())
-  }
-
-  def transmitEventToClient(event: SimpleEvent): Unit = {
-    transmitJsonToClient(WebsocketEventMapper.toJson(event, session))
-  }
-
-}

knockoutwhistweb/app/services/JwtKeyProvider.scala

@@ -12,28 +12,10 @@ import javax.inject.*
 @Singleton
 class JwtKeyProvider @Inject()(config: Configuration) {
 
-  val publicKey: RSAPublicKey = {
+  private def cleanPem(pem: String): String =
-    val pemOpt = config.getOptional[String]("auth.publicKeyPem")
+    pem.replaceAll("-----BEGIN (.*)-----", "")
-    val fileOpt = config.getOptional[String]("auth.publicKeyFile")
+      .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.")
-    }
-  }
 
   private def loadPublicKeyFromPem(pem: String): RSAPublicKey = {
     val decoded = Base64.getDecoder.decode(cleanPem(pem))
@@ -47,9 +29,28 @@ class JwtKeyProvider @Inject()(config: Configuration) {
     KeyFactory.getInstance("RSA").generatePrivate(spec).asInstanceOf[RSAPrivateKey]
   }
 
-  private def cleanPem(pem: String): String =
+  val publicKey: RSAPublicKey = {
-    pem.replaceAll("-----BEGIN (.*)-----", "")
+    val pemOpt = config.getOptional[String]("auth.publicKeyPem")
-      .replaceAll("-----END (.*)-----", "")
+    val fileOpt = config.getOptional[String]("auth.publicKeyFile")
-      .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.")
+    }
+  }
   
 }

knockoutwhistweb/app/util/WebUIUtils.scala

@@ -1,9 +1,8 @@
 package util
 
-import de.knockoutwhist.cards.{Card, Hand}
+import de.knockoutwhist.cards.Card
 import de.knockoutwhist.cards.CardValue.*
 import de.knockoutwhist.cards.Suit.{Clubs, Diamonds, Hearts, Spades}
-import play.api.libs.json.{JsArray, Json}
 import play.twirl.api.Html
 import scalafx.scene.image.Image
 
@@ -37,22 +36,4 @@ object WebUIUtils {
     f"$cv$s"
   }
 
-  /**
-   * Map a Hand to a JsArray of cards
-   * Per card it has the string and the index in the hand
-   * @param hand
-   * @return
-   */
-  def handToJson(hand: Hand): JsArray = {
-    val cards = hand.cards
-    JsArray(
-      cards.zipWithIndex.map { case (card, index) =>
-        Json.obj(
-          "idx" -> index,
-          "card" -> cardtoString(card)
-        )
-      }
-    )
-  }
-
 }

knockoutwhistweb/app/util/WebsocketEventMapper.scala

@@ -1,47 +0,0 @@
-package util
-
-import de.knockoutwhist.utils.events.SimpleEvent
-import logic.game.GameLobby
-import model.sessions.UserSession
-import play.api.libs.json.{JsValue, Json}
-import tools.jackson.databind.json.JsonMapper
-import tools.jackson.module.scala.ScalaModule
-import util.mapper.{CardPlayedEventMapper, GameStateEventMapper, ReceivedHandEventMapper, SimpleEventMapper}
-
-object WebsocketEventMapper {
-
-  private val scalaModule = ScalaModule.builder()
-    .addAllBuiltinModules()
-    .supportScala3Classes(true)
-    .build()
-
-  private val mapper = JsonMapper.builder().addModule(scalaModule).build()
-
-  private var customMappers: Map[String,SimpleEventMapper[SimpleEvent]] = Map()
-
-  private def registerCustomMapper[T <: SimpleEvent](mapper: SimpleEventMapper[T]): Unit = {
-    customMappers = customMappers + (mapper.id -> mapper.asInstanceOf[SimpleEventMapper[SimpleEvent]])
-  }
-  
-  // Register all custom mappers here
-  registerCustomMapper(ReceivedHandEventMapper)
-  registerCustomMapper(GameStateEventMapper)
-  registerCustomMapper(CardPlayedEventMapper)
-  
-  def toJson(obj: SimpleEvent, session: UserSession): JsValue = {
-    val data: Option[JsValue] = if (customMappers.contains(obj.id)) {
-      Some(customMappers(obj.id).toJson(obj, session))
-    }else {
-      None
-    }
-    if (data.isEmpty) {
-      return Json.obj()
-    }
-    Json.obj(
-      "id" -> ("request-" + java.util.UUID.randomUUID().toString),
-      "event" -> obj.id,
-      "data" -> data
-    )
-  }
-
-}

knockoutwhistweb/app/util/mapper/CardPlayedEventMapper.scala

@@ -1,20 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.global.CardPlayedEvent
-import model.sessions.UserSession
-import play.api.libs.json.{JsArray, JsObject, Json}
-import util.WebUIUtils
-
-object CardPlayedEventMapper extends SimpleEventMapper[CardPlayedEvent]{
-
-  override def id: String = "CardPlayedEvent"
-
-  override def toJson(event: CardPlayedEvent, session: UserSession): JsObject = {
-    Json.obj(
-      "firstCard" -> (if (event.trick.firstCard.isDefined) WebUIUtils.cardtoString(event.trick.firstCard.get) else "BLANK"),
-      "playedCards" -> JsArray(event.trick.cards.map { case (card, player) =>
-        Json.obj("cardId" -> WebUIUtils.cardtoString(card), "player" -> player.name)
-      }.toList)
-    )
-  }
-}

knockoutwhistweb/app/util/mapper/GameStateEventMapper.scala

@@ -1,18 +0,0 @@
-package util.mapper
-
-import controllers.IngameController
-import de.knockoutwhist.events.global.GameStateChangeEvent
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-
-object GameStateEventMapper extends SimpleEventMapper[GameStateChangeEvent] {
-
-  override def id: String = "GameStateChangeEvent"
-
-  override def toJson(event: GameStateChangeEvent, session: UserSession): JsObject = {
-    Json.obj(
-      //Title
-      "content" -> IngameController.returnInnerHTML(session.gameLobby, event.newState, session.user).toString
-    )
-  }
-}

knockoutwhistweb/app/util/mapper/ReceivedHandEventMapper.scala

@@ -1,17 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.player.ReceivedHandEvent
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-import util.WebUIUtils
-
-object ReceivedHandEventMapper extends SimpleEventMapper[ReceivedHandEvent] {
-
-  override def id: String = "ReceivedHandEvent"
-  override def toJson(event: ReceivedHandEvent, session: UserSession): JsObject = {
-    Json.obj(
-      "dog" -> event.player.isInDogLife,
-      "hand" -> event.player.currentHand().map(hand => WebUIUtils.handToJson(hand))
-    )
-  }
-}

knockoutwhistweb/app/util/mapper/SimpleEventMapper.scala

@@ -1,13 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.utils.events.SimpleEvent
-import logic.game.GameLobby
-import model.sessions.UserSession
-import play.api.libs.json.JsObject
-
-trait SimpleEventMapper[T <: SimpleEvent] {
-  
-  def id: String
-  def toJson(event: T, session: UserSession): JsObject
-
-}

knockoutwhistweb/app/views/ingame/finishedMatch.scala.html

@@ -1,38 +0,0 @@
-@(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>

knockoutwhistweb/app/views/ingame/ingame.scala.html

@@ -1,8 +1,8 @@
 @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="lobby-background vh-100">
     <main class="game-field-background vh-100 ingame-side-shadow">
         <div class="py-5 container-xxl">
@@ -10,12 +10,8 @@
             <div class="row ms-4 me-4">
                 <div class="col-4 mt-5 text-start">
                     <h4 class="fw-semibold mb-1">Current Player</h4>
-                    @if(gamelobby.getLogic.getCurrentPlayer.isDefined) {
                     <p class="fs-5 text-primary" id="current-player-name">@gamelobby.getLogic.getCurrentPlayer.get.name</p>
-                    }else {
+                    @if(!TrickUtil.isOver(gamelobby.getLogic.getCurrentMatch.get, gamelobby.getLogic.getPlayerQueue.get)) {
-                        <p class="fs-5 text-primary" id="current-player-name">---</p>
-                    }
-                    @if(gamelobby.getLogic.getPlayerQueue.isDefined && gamelobby.getLogic.getCurrentMatch && !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>
@@ -33,7 +29,6 @@
                             <div style="width: 50%">TRICKS</div>
                         </div>
 
-                        @if(gamelobby.getLogic.getPlayerQueue.isDefined) {
                         @for(player <- gamelobby.getLogic.getPlayerQueue.get.toList.sortBy { p =>
                         -(gamelobby.getLogic.getCurrentRound.get.tricklist.filter { trick => trick.winner.contains(p) }.size)
                         }) {
@@ -44,22 +39,12 @@
                             </div>
                         </div>
                         }
-                        }else{
-                            <div class="d-flex justify-content-between score-row pt-1">
-                            </div>
-                        }
-
 
                     </div>
                     <div class="d-flex justify-content-center g-3 mb-5" id="trick-cards-container">
-                        @if(gamelobby.getLogic.getCurrentTrick.isEmpty || gamelobby.getLogic.getCurrentTrick.get.cards.isEmpty) {
-                            <div class="col-auto">
-                            </div>
-                        } else {
                         @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;
+                            <div class="card text-center shadow-sm border-0 bg-transparent" style="width: 7rem; backdrop-filter: blur(4px);">
-                                        backdrop-filter: blur(4px);">
                                 <div class="p-2">
                                     @util.WebUIUtils.cardtoImage(cardplayed) width="100%"/>
                                 </div>
@@ -69,22 +54,16 @@
                             </div>
                         </div>
                         }
-                        }
                     </div>
                 </div>
                 <div class="col-4 mt-5 text-end">
                     <h4 class="fw-semibold mb-1">Trumpsuit</h4>
-                    @if(gamelobby.getLogic.getCurrentRound.isEmpty) {
-                        <p class="fs-5 text-primary" id="trumpsuit">No Trumpsuit</p>
-                    }else {
                     <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.isDefined && gamelobby.getLogic.getCurrentTrick.get.firstCard.isDefined) {
+                        @if(gamelobby.getLogic.getCurrentTrick.get.firstCard.isDefined) {
-                        @util.WebUIUtils.cardtoImage(gamelobby.getLogic.getCurrentTrick.get.firstCard.get)
+                        @util.WebUIUtils.cardtoImage(gamelobby.getLogic.getCurrentTrick.get.firstCard.get) width="80px"/>
-                        width="80px"/>
                         } else {
                         @views.html.render.card.apply("images/cards/1B.png")("Blank Card") width="80px"/>
                         }
@@ -92,45 +71,23 @@
                 </div>
             </div>
 
-            <div class="row justify-content-center g-2 mt-4 bottom-div" style="backdrop-filter: blur(4px);
+            <div class="row justify-content-center g-2 mt-4 bottom-div" style="backdrop-filter: blur(4px); margin-left: 0; margin-right: 0;">
-                margin-left: 0;
+                <div class="row justify-content-center ingame-cards-slide" id="card-slide">
-                margin-right: 0;">
-                <div class="row justify-content-center ingame-cards-slide @{
-                    !gamelobby.logic.getCurrentPlayer.contains(player) ? "inactive" |: ""
-                }" id="card-slide">
-                    @if(player.currentHand().isEmpty || player.currentHand().get.cards.isEmpty) {
-
-                    } else {
                     @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')">
+                            <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')">
                                 @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>
     </main>
 </div>
 <script>
-        function waitForFunction(name, checkInterval = 100) {
+        document.addEventListener('DOMContentLoaded', () => {
-            return new Promise(resolve => {
+            pollForUpdates('@gamelobby.id');
-                const timer = setInterval(() => {
-                    if (typeof window[name] === "function") {
-                        clearInterval(timer);
-                        resolve(window[name]);
-                    }
-                }, checkInterval);
         });
-        }
-        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
-    connectWebSocket()
 </script>
+}

knockoutwhistweb/app/views/ingame/selecttrump.scala.html

@@ -1,5 +1,6 @@
 @(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
 
+@main("Selecting Trumpsuit...") {
 <div id="selecttrumpsuit" class="game-field game-field-background">
     <div class="ingame-stage blur-sides">
         <div class="container py-4">
@@ -10,7 +11,6 @@
                             <h3 class="mb-0">Select Trump Suit</h3>
                         </div>
                         <div class="card-body">
-                            @if(gamelobby.logic.getCurrentMatch.isDefined) {
                             @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.
@@ -18,28 +18,36 @@
 
                                 <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')">
+                                        <form action="@routes.IngameController.playTrump(gamelobby.id)" method="post">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades))
+                                            <input type="hidden" name="cardId" value="0" />
-                                                width="120px" style="border-radius: 6px"/>
+                                            <button type="submit" class="btn btn-outline-light p-0 border-0 shadow-none" name="trump" value="0" style="border-radius: 6px">
-                                            </div>
+                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades)) width="120px" style="border-radius: 6px"/>
+                                            </button>
+                                        </form>
                                     </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')">
+                                        <form action="@routes.IngameController.playTrump(gamelobby.id)" method="post">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts))
+                                            <input type="hidden" name="cardId" value="1" />
-                                                width="120px" style="border-radius: 6px"/>
+                                            <button type="submit" class="btn btn-outline-light p-0 border-0 shadow-none" name="trump" value="1" style="border-radius: 6px">
-                                            </div>
+                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts)) width="120px" style="border-radius: 6px"/>
+                                            </button>
+                                        </form>
                                     </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')">
+                                        <form action="@routes.IngameController.playTrump(gamelobby.id)" method="post">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds))
+                                            <input type="hidden" name="cardId" value="2" />
-                                                width="120px" style="border-radius: 6px"/>
+                                            <button type="submit" class="btn btn-outline-light p-0 border-0 shadow-none" name="trump" value="2" style="border-radius: 6px">
-                                            </div>
+                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds)) width="120px" style="border-radius: 6px"/>
+                                            </button>
+                                        </form>
                                     </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')">
+                                        <form action="@routes.IngameController.playTrump(gamelobby.id)" method="post">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs))
+                                            <input type="hidden" name="cardId" value="3" />
-                                                width="120px" style="border-radius: 6px"/>
+                                            <button type="submit" class="btn btn-outline-light p-0 border-0 shadow-none" name="trump" value="3" style="border-radius: 6px">
-                                            </div>
+                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs)) width="120px" style="border-radius: 6px"/>
+                                            </button>
+                                        </form>
                                     </div>
                                 </div>
                                 <div class="row justify-content-center ingame-cards-slide" id="card-slide">
@@ -51,29 +59,14 @@
                                 </div>
                             } else {
                                 <div class="alert alert-warning" role="alert" aria-live="polite">
-                                        @gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get.name
+                                    @gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get.name is choosing a trumpsuit. The new round will start once a suit is picked.
-                                        is choosing a trumpsuit. The new round will start once a suit is picked.
                                 </div>
                             }
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </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>

knockoutwhistweb/app/views/ingame/tie.scala.html

@@ -1,4 +1,6 @@
 @(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
+
+@main("Tie") {
 <div id="tie" class="game-field game-field-background">
     <div class="ingame-stage blur-sides">
         <div class="container py-4">
@@ -23,26 +25,20 @@
                             @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 @{
+                                        Pick a number between 1 and @{maxNum + 1}. The resulting card will be your card for the cut.
-                                        maxNum + 1
-                                    }.
-                                    The resulting card will be your card for the cut.
                                     </div>
 
-                                    <div class="row g-2 align-items-center">
+                                    <form class="row g-2 align-items-center" method="post" action="@routes.IngameController.playTie(gamelobby.id)">
                                         <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="@{
+                                            <input type="number" id="tieNumber" class="form-control" name="tie" min="1" max="@{maxNum + 1}" placeholder="1" required>
-                                                maxNum + 1
-                                            }" placeholder="1" required>
                                         </div>
                                         <div class="col-auto">
-                                            <button onclick="selectTie('@gamelobby.id')" class="btn btn-primary">
+                                            <button type="submit" class="btn btn-primary">Confirm</button>
-                                                Confirm</button>
-                                        </div>
                                         </div>
+                                    </form>
                                     <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
 
                                     <div id="cardsplayed" class="row g-3 justify-content-center">
@@ -71,8 +67,7 @@
                                 }
                             } else {
                                 <div class="alert alert-warning" role="alert" aria-live="polite">
-                                    <strong>@gamelobby.logic.playerTieLogic.currentTiePlayer()</strong>
+                                    <strong>@gamelobby.logic.playerTieLogic.currentTiePlayer()</strong> is currently picking a number for the cut.
-                                    is currently picking a number for the cut.
                                 </div>
 
                                 <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
@@ -109,17 +104,4 @@
         </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>

knockoutwhistweb/app/views/lobby/lobby.scala.html

@@ -1,5 +1,6 @@
 @(user: Option[model.users.User], gamelobby: logic.game.GameLobby)
 
+@main("Lobby") {
 <main class="lobby-background vh-100" id="lobbybackground">
     <div class="container d-flex flex-column" style="height: calc(100vh - 1rem);">
         <div class="row">
@@ -14,8 +15,7 @@
         </div>
         <div class="row">
             <div class="col">
-                <div class="p-3 text-center fs-4" id="playerAmount">
+                <div class="p-3 text-center fs-4">Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
-                    Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
             </div>
         </div>
         <div class="row justify-content-center align-items-center flex-grow-1">
@@ -31,8 +31,7 @@
                                     <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')">
+                                    <div class="btn btn-danger" onclick="removePlayer('@gamelobby.id', '@playersession.id')">Remove</div>
-                                Remove</div>
                                 }
                                 </div>
                             </div>
@@ -69,16 +68,8 @@
     </div>
 </main>
 <script>
-        function waitForFunction(name, checkInterval = 100) {
+        document.addEventListener('DOMContentLoaded', () => {
-            return new Promise(resolve => {
+            pollForUpdates('@gamelobby.id');
-                const timer = setInterval(() => {
-                    if (typeof window[name] === "function") {
-                        clearInterval(timer);
-                        resolve(window[name]);
-                    }
-                }, checkInterval);
         });
-        }
-        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
-    connectWebSocket()
 </script>
+}

knockoutwhistweb/app/views/login/login.scala.html

@@ -1,9 +1,13 @@
 @()
+
+@main("Login") {
+
     <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;">
+
+                <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>
@@ -35,9 +39,9 @@
             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>
+}

knockoutwhistweb/app/views/main.scala.html

@@ -18,17 +18,12 @@
         <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>
 
-    <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">
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="@routes.JavaScriptRoutingController.javascriptRoutes()" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/websocket.js")" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/events.js")" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/interact.js")" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></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
+        <script src="@routes.JavaScriptRoutingController.javascriptRoutes()" type="text/javascript"></script>
+        <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>
 </html>

knockoutwhistweb/app/views/mainmenu/creategame.scala.html

@@ -1,5 +1,6 @@
 @(user: Option[model.users.User])
 
+@main("Create Game") {
 @navbar(user)
 <main class="lobby-background flex-grow-1">
     <div class="w-25 mx-auto">
@@ -28,6 +29,4 @@
         </div>
     </div>
 </main>
-<script>
+}
-            disconnectWebSocket();
-    </script>

knockoutwhistweb/app/views/mainmenu/navbar.scala.html

@@ -13,20 +13,18 @@
                     <ul class="navbar-nav mb-2 mb-lg-0">
                         @if(user.isDefined) {
                             <li class="nav-item">
-                            <a class="nav-link active" aria-current="page" onclick="navSpa('0', 'Knockout Whist - Create Game'); return false;" href="@routes.MainMenuController.mainMenu()">
+                                <a class="nav-link active" aria-current="page" href="@routes.MainMenuController.mainMenu()">Create Game</a>
-                                Create Game</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link disabled" aria-disabled="true">Lobbies</a>
                             </li>
                         }
                         <li class="nav-item">
-                        <a class="nav-link active" onclick="navSpa('1', 'Knockout Whist - Rules'); return false;" href="@routes.MainMenuController.rules()">
+                            <a class="nav-link active" href="@routes.MainMenuController.rules()">Rules</a>
-                            Rules</a>
                         </li>
                     </ul>
-                <form class="navbar-nav me-auto mb-2 mb-lg-0" onsubmit="joinGame(); return false;">
+                    <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" id="gameId" aria-label="Join Game"/>
+                        <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>
@@ -40,10 +38,8 @@
                                 <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">
+                                <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">Stats</a></li>
-                                Stats</a></li>
+                                <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">Settings</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>

knockoutwhistweb/app/views/mainmenu/rules.scala.html

@@ -1,4 +1,6 @@
 @(user: Option[model.users.User])
+
+@main("Rules") {
     @navbar(user)
 
     <main class="lobby-background flex-grow-1">
@@ -175,6 +177,4 @@
             </div>
         </div>
     </main>
-<script>
+}
-        disconnectWebSocket();
-</script>

knockoutwhistweb/conf/logback.xml

@@ -14,8 +14,7 @@
     <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>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
-            </pattern>
     </encoder>
   </appender>
 
@@ -28,8 +27,7 @@
     <!-- <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>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
-            </pattern>
     </encoder>
   </appender>
 

knockoutwhistweb/conf/routes

@@ -12,7 +12,6 @@ GET         /assets/*file            controllers.Assets.versioned(path="/public"
 # Main menu routes
 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()
@@ -25,6 +24,14 @@ 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: String)
 
-# Websocket
+POST    /game/:id/trump              controllers.IngameController.playTrump(id: String)
-GET         /websocket               controllers.WebsocketController.socket()
+POST    /game/:id/tie                  controllers.IngameController.playTie(id: String)
+
+GET     /game/:id/leaveGame         controllers.IngameController.leaveGame(id: String)
+POST   /game/:id/playCard           controllers.IngameController.playCard(id: String)
+# Polling
+GET    /polling                    controllers.PollingController.polling(gameId: String)

knockoutwhistweb/public/javascripts/events.js

@@ -1,89 +0,0 @@
-function receiveHandEvent(eventData) {
-    //Data
-    const dog = eventData.dog;
-    const hand = eventData.hand;
-
-    const handElement = $('#card-slide');
-    handElement.addClass('ingame-cards-slide')
-
-    let newHtml = '';
-
-    //Build Hand Container
-    hand.forEach((card) => {
-        //Data
-        const idx = card.idx
-        const cardS = card.card;
-
-        const cardHtml = `
-                        <div class="col-auto handcard" style="border-radius: 6px">
-                            <div class="btn btn-outline-light p-0 border-0 shadow-none" 
-                                 data-card-id="${idx}" 
-                                 style="border-radius: 6px" 
-                                 onclick="handlePlayCard(this, '${dog}')">
-                                
-                                <img src="/assets/images/cards/${cardS}.png" width="120px" style="border-radius: 6px" alt="${cardS}"/>
-                            </div>
-                        </div>
-                    `;
-        newHtml += cardHtml;
-    });
-
-    //Build dog if needed
-    if (dog) {
-        newHtml += `
-                        <div class="mt-2">
-                            <button class="btn btn-danger" onclick="handleSkipDogLife(this)">Skip Turn</button>
-                        </div>
-                    `;
-    }
-    handElement.html(newHtml);
-}
-
-function receiveGameStateChange(eventData) {
-    const content = eventData.content;
-    const title = eventData.title || 'Knockout Whist';
-
-    exchangeBody(content, title);
-}
-function receiveCardPlayedEvent(eventData) {
-    const firstCard = eventData.firstCard;
-    const playedCards = eventData.playedCards;
-
-    const trickCardsContainer = $('#trick-cards-container');
-    const firstCardContainer = $('#first-card-container')
-
-    let trickHTML = '';
-    playedCards.forEach(cardCombo => {
-        trickHTML += `
-                            <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">
-                                        <img src="/assets/images/cards/${cardCombo.cardId}.png" width="100%" alt="${cardCombo.cardId}"/>
-                                    </div>
-                                    <div class="card-body p-2 bg-transparent">
-                                        <small class="fw-semibold text-secondary">${cardCombo.player}</small>
-                                    </div>
-                                </div>
-                            </div>
-                        `;
-    });
-    trickCardsContainer.html(trickHTML);
-
-    let altText;
-    let imageSrc;
-    if (firstCard === "BLANK") {
-        imageSrc = "/assets/images/cards/1B.png";
-        altText = "Blank Card";
-    } else {
-        imageSrc = `/assets/images/cards/${firstCard}.png`;
-        altText = `Card ${firstCard}`;
-    }
-
-    const newFirstCardHTML = `
-                        <img src="${imageSrc}" alt="${altText}" width="80px" style="border-radius: 6px"/>
-                    `;
-    firstCardContainer.html(newFirstCardHTML);
-}
-onEvent("ReceivedHandEvent", receiveHandEvent)
-onEvent("GameStateChangeEvent", receiveGameStateChange)
-onEvent("CardPlayedEvent", receiveCardPlayedEvent)

knockoutwhistweb/public/javascripts/interact.js

@@ -1,7 +0,0 @@
-function handlePlayCard(card, dog) {
-  // TODO needs implementation
-}
-
-function handleSkipDogLife(button) {
-  // TODO needs implementation
-}

knockoutwhistweb/public/javascripts/main.js

@@ -79,14 +79,211 @@
     })
 })()
 
+function pollForUpdates(gameId) {
+    if (!gameId) {
+        console.error("Game ID is missing. Stopping poll.");
+        return;
+    }
+    const element = document.getElementById('card-slide');
+    const element2 = document.getElementById('lobbybackground');
+    // Safety check for the target element
+    if (!element && !element2) {
+        console.error("Polling target element not found. Stopping poll.");
+        // Use a timeout to retry in case the DOM loads late, passing gameId.
+        setTimeout(() => pollForUpdates(gameId), 5000);
+        return;
+    }
+    const route = jsRoutes.controllers.PollingController.polling(gameId);
+
+    // Call your specific controller endpoint
+    fetch(route.url)
+        .then(response => {
+            if (response.status === 204) {
+                console.log("Polling: Timeout reached. Restarting poll.");
+
+                // CRITICAL: Pass gameId in the recursive call
+                setTimeout(() => pollForUpdates(gameId), 5000);
+            } else if (response.ok && response.status === 200) {
+                response.json().then(data => {
+
+                    if (data.status === "cardPlayed" && data.handData && element) {
+                        console.log("Event received: Card played. Redrawing hand.");
+
+                        const newHand = data.handData;
+                        let newHandHTML = '';
+                        element.innerHTML = '';
+
+                        if(data.animation) {
+                            if (!element.classList.contains('ingame-cards-slide')) {
+                                element.classList.add('ingame-cards-slide');
+                            }
+                        } else {
+                            element.classList.remove('ingame-cards-slide');
+                        }
+
+                        newHand.forEach((cardId, index) => {
+                            const cardHtml = `
+                                <div class="col-auto handcard" style="border-radius: 6px">
+                                    <div class="btn btn-outline-light p-0 border-0 shadow-none" 
+                                         data-card-id="${index}" 
+                                         style="border-radius: 6px" 
+                                         onclick="handlePlayCard(this, '${gameId}')">
+                                        
+                                        <img src="/assets/images/cards/${cardId}.png" width="120px" style="border-radius: 6px"/>
+                                    </div>
+                                </div>
+                            `;
+                            newHandHTML += cardHtml;
+                        });
+
+                        element.innerHTML = newHandHTML;
+
+                        const currentPlayerElement = document.getElementById('current-player-name');
+                        if (currentPlayerElement) {
+                            currentPlayerElement.textContent = data.currentPlayerName;
+                        }
+                        const nextPlayerElement = document.getElementById('next-player-name');
+                        if (nextPlayerElement && data.nextPlayer) {
+                            // Use the correctly named field from the server response
+                            nextPlayerElement.textContent = data.nextPlayer;
+                        } else {
+                            // Case 2: Player name is empty or null (signal to clear display).
+                            nextPlayerElement.textContent = "";
+                        }
+
+                        const trumpElement = document.getElementById('trump-suit');
+                        if (trumpElement) {
+                            trumpElement.textContent = data.trumpSuit;
+                        }
+                        const trickContainer = document.getElementById('trick-cards-container');
+                        if (trickContainer) {
+                            let trickHTML = '';
+
+                            // Iterate over the array of played cards received from the server
+                            data.trickCards.forEach(trickCard => {
+                                // Reconstruct the HTML structure from your template
+                                trickHTML += `
+                                    <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">
+                                                <img src="/assets/images/cards/${trickCard.cardId}.png" width="100%"/>
+                                            </div>
+                                            <div class="card-body p-2 bg-transparent">
+                                                <small class="fw-semibold text-secondary">${trickCard.player}</small>
+                                            </div>
+                                        </div>
+                                    </div>
+                                `;
+                            });
+                            trickContainer.innerHTML = trickHTML;
+                        }
+                        const scoreBody = document.getElementById('score-table-body');
+                        if (scoreBody && data.scoreTable) {
+                            let scoreHTML = '';
+                            scoreHTML += `<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>`
+                            data.scoreTable.forEach(score => {
+                                scoreHTML += `
+                                    <div class="d-flex justify-content-between score-row pt-1">
+                                        <div style="width: 50%" class="text-truncate">${score.name}</div>
+                                        <div style="width: 50%">${score.tricks}</div>
+                                    </div>
+                                `;
+                            });
+                            scoreBody.innerHTML = scoreHTML;
+                        }
+                        const firstCardContainer = document.getElementById('first-card-container');
+                        const cardId = data.firstCardId; // This will be "KH", "S7", or "BLANK"
+
+                        if (firstCardContainer) {
+                            let imageSrc = '';
+                            let altText = 'First Card';
+
+                            // Check if a card was actually played or if it's the start of a trick
+                            if (cardId === "BLANK") {
+                                imageSrc = "/assets/images/cards/1B.png";
+                                altText = "Blank Card";
+                            } else {
+                                imageSrc = `/assets/images/cards/${cardId}.png`;
+                            }
+
+                            // Reconstruct the image HTML (assuming the inner element needs replacement)
+                            const newImageHTML = `
+                                <img src="${imageSrc}" alt="${altText}" width="80px" style="border-radius: 6px"/>
+                            `;
+
+                            // Clear the container and insert the new image
+                            firstCardContainer.innerHTML = newImageHTML;
+                        }
+                    } else if (data.status === "reloadEvent") {
+                        window.location.href = data.redirectUrl;
+                    } else if (data.status === "lobbyUpdate") {
+                        const players = document.getElementById("players");
+                        let newHtml = ''
+
+                        if (data.host) {
+                            data.users.forEach(user => {
+
+                                const inner = user.self ? `<h5 class="card-title">${user.name} (You)</h5>
+                                    <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>`
+                                    : `    <h5 class="card-title">${user.name}</h5>
+                                        <div class="btn btn-danger" onclick="removePlayer('${gameId}', '${user.id}')">Remove</div>`
+
+                                newHtml += `<div class="col-auto my-auto m-3">
+                                                <div class="card" style="width: 18rem;">
+                                                    <img src="/assets/images/profile.png" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
+                                                    <div class="card-body">
+                                                        ${inner}
+                                                    </div>
+                                                </div>
+                                            </div>`
+                            })
+                        } else {
+                            data.users.forEach(user => {
+
+                                const inner = user.self ? `<h5 class="card-title">${user.name} (You)</h5>` : `    <h5 class="card-title">${user.name}</h5>`
+
+                                newHtml += `<div class="col-auto my-auto m-3">
+                                                <div class="card" style="width: 18rem;">
+                                                    <img src="/assets/images/profile.png" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
+                                                    <div class="card-body">
+                                                        ${inner}
+                                                    </div>
+                                                </div>
+                                            </div>`
+                            })
+                        }
+                        players.innerHTML = newHtml;
+                    }
+                    pollForUpdates(gameId);
+                });
+            } else {
+                // Handle network or server errors
+                console.error(`Polling error: Status ${response.status}`);
+                // Wait before retrying, passing gameId correctly
+                setTimeout(() => pollForUpdates(gameId), 5000);
+            }
+        })
+        .catch(error => {
+            console.error("Network error during polling:", error);
+            // Wait before retrying on network failure, passing gameId correctly
+            setTimeout(() => pollForUpdates(gameId), 5000);
+        });
+}
+
 function createGameJS() {
-    let lobbyName = $('#lobbyname').val();
+    let lobbyName = document.getElementById("lobbyname").value;
-    if ($.trim(lobbyName) === "") {
+    if (lobbyName === "") {
         lobbyName = "DefaultLobby"
     }
+    const playerAmount = document.getElementById("playeramount").value;
     const jsonObj = {
         lobbyname: lobbyName,
-        playeramount: $("#playeramount").val()
+        playeramount: playerAmount
     }
     sendGameCreationRequest(jsonObj);
 }
@@ -94,129 +291,189 @@ function createGameJS() {
 function sendGameCreationRequest(dataObject) {
     const route = jsRoutes.controllers.MainMenuController.createGame();
 
-    $.ajax({
+    fetch(route.url, {
-        url: route.url,
+        method: route.type,
-        type: route.type,
+        headers: {
-        contentType: 'application/json',
+            'Content-Type': 'application/json',
-        data: JSON.stringify(dataObject),
+        },
-        dataType: 'json',
+        body: JSON.stringify(dataObject)
-        success: (data => {
+    })
+        .then(response => {
+            return response.json().then(data => {
+                if (!response.ok) {
+                    return Promise.reject(data);
+                }
+                return data;
+            });
+        })
+        .then(data => {
             if (data.status === 'success') {
-                exchangeBody(data.content, "Knockout Whist - Lobby", data.redirectUrl);
+                window.location.href = data.redirectUrl;
             }
-        }),
+        })
-        error: ((jqXHR) => {
+        .catch(error => {
-            const errorData = JSON.parse(jqXHR.responseText);
+            if (error && error.errorMessage) {
-            if (errorData && errorData.errorMessage) {
+                alert(`${error.errorMessage}`);
-                alert(`${errorData.errorMessage}`);
             } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
+                alert('An unexpected error occurred. Please try again.');
+            }
+        });
+}
+function startGame(gameId) {
+    sendGameStartRequest(gameId)
+}
+function sendGameStartRequest(gameId) {
+    const route = jsRoutes.controllers.IngameController.startGame(gameId);
+
+    fetch(route.url, {
+        method: route.type,
+    })
+        .then(response => {
+            return response.json().then(data => {
+                if (!response.ok) {
+                    return Promise.reject(data);
+                }
+                return data;
+            });
+        })
+        .then(data => {
+            // SUCCESS BLOCK: data is the { status: 'success', ... } object
+            if (data.status === 'success') {
+                window.location.href = data.redirectUrl;
             }
         })
+        .catch(error => {
+            if (error && error.errorMessage) {
+                alert(`${error.errorMessage}`);
+            } else {
+                alert('An unexpected error occurred. Please try again.');
+            }
+        });
+}
+function removePlayer(gameid, playersessionId) {
+    sendRemovePlayerRequest(gameid, playersessionId)
+}
+
+function sendRemovePlayerRequest(gameId, playersessionId) {
+    const route = jsRoutes.controllers.IngameController.kickPlayer(gameId, playersessionId);
+
+    fetch(route.url, {
+        method: route.type,
+        headers: {
+            'Content-Type': 'application/json',
+        }
     })
+        .then(response => {
+            return response.json().then(data => {
+                if (!response.ok) {
+                    return Promise.reject(data);
+                }
+                return data;
+            });
+        })
+        .then(data => {
+            // SUCCESS BLOCK: data is the { status: 'success', ... } object
+            if (data.status === 'success') {
+                window.location.href = data.redirectUrl;
+            }
+        })
+        .catch(error => {
+            if (error && error.errorMessage) {
+                alert(`${error.errorMessage}`);
+            } else {
+                alert('An unexpected error occurred. Please try again.');
+            }
+        });
 }
 
-function exchangeBody(content, title = "Knockout Whist", url = null) {
+function leaveGame(gameId) {
-    if (url) {
+    sendLeavePlayerRequest(gameId)
-        window.history.pushState({}, title, url);
-    }
-    $("#main-body").html(content);
-    document.title = title;
 }
 
-function login() {
+function sendLeavePlayerRequest(gameId) {
-    const username = $('#username').val();
-    const password = $('#password').val();
 
+    const route = jsRoutes.controllers.IngameController.leaveGame(gameId);
+    fetch(route.url, {
+        method: route.type,
+    })
+        .then(response => {
+            return response.json().then(data => {
+                if (!response.ok) {
+                    return Promise.reject(data);
+                }
+                return data;
+            });
+        })
+        .then(data => {
+            // SUCCESS BLOCK: data is the { status: 'success', ... } object
+            if (data.status === 'success') {
+                window.location.href = data.redirectUrl;
+            }
+        })
+        .catch(error => {
+            if (error && error.errorMessage) {
+                alert(`${error.errorMessage}`);
+            } else {
+                alert('An unexpected error occurred. Please try again.');
+            }
+        });
+}
+
+function handlePlayCard(cardobject, gameId) {
+    const cardId = cardobject.dataset.cardId;
     const jsonObj = {
-        username: username,
+        cardID: cardId
-        password: password
+    }
+    sendPlayCardRequest(jsonObj, gameId, cardobject)
+}
+
+function sendPlayCardRequest(jsonObj, gameId, cardobject) {
+    const wiggleKeyframes = [
+        { transform: 'translateX(0)' },
+        { transform: 'translateX(-5px)' },
+        { transform: 'translateX(5px)' },
+        { transform: 'translateX(-5px)' },
+        { transform: 'translateX(0)' }
+    ];
+
+    // Define the timing options
+    const wiggleTiming = {
+        duration: 400, // 0.4 seconds
+        iterations: 1,
+        easing: 'ease-in-out',
+        // Fill mode ensures the final state is applied until reset
+        fill: 'forwards'
     };
+    const route = jsRoutes.controllers.IngameController.playCard(gameId);
 
-    const route = jsRoutes.controllers.UserController.login_Post();
+    fetch(route.url, {
-    $.ajax({
+        method: route.type,
-        url: route.url,
+        headers: {
-        type: route.type,
+            'Content-Type': 'application/json',
-        contentType: 'application/json',
+        },
-        dataType: 'json',
+        body: JSON.stringify(jsonObj)
-        data: JSON.stringify(jsonObj),
+    })
-        success: (data => {
+        .then(response => {
-            if (data.status === 'success') {
+            return response.json().then(data => {
-                exchangeBody(data.content, 'Knockout Whist - Create Game', data.redirectUrl);
+                if (!response.ok) {
-                return
+                    return Promise.reject(data);
                 }
-            alert('Login failed. Please check your credentials and try again.');
+                return data;
-        }),
+            });
-        error: ((jqXHR) => {
+        })
-            const errorData = JSON.parse(jqXHR.responseText);
+        .then(data => {
-            if (errorData?.errorMessage) {
+            if (data.status === 'success') {
-                alert(`${errorData.errorMessage}`);
+                //window.location.href = data.redirectUrl;
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
             }
         })
+        .catch(error => {
+            if (error && error.errorMessage.includes("You can't play this card!")) {
+                cardobject.parentElement.animate(wiggleKeyframes, wiggleTiming);
+            } else if (error && error.errorMessage) {
+                alert(`${error.errorMessage}`);
+            } else {
+                alert('An unexpected error occurred. Please try again.');
+            }
         });
 }
 
-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
-}
-
-
-globalThis.exchangeBody = exchangeBody;

knockoutwhistweb/public/javascripts/particles.js

@@ -159,7 +159,8 @@ var pJS = function (tag_id, params) {
     if(pJS.retina_detect && window.devicePixelRatio > 1){
       pJS.canvas.pxratio = window.devicePixelRatio; 
       pJS.tmp.retina = true;
-        } else {
+    } 
+    else{
       pJS.canvas.pxratio = 1;
       pJS.tmp.retina = false;
     }
@@ -180,6 +181,7 @@ var pJS = function (tag_id, params) {
   };
 
 
+
   /* ---------- pJS functions - canvas ------------ */
 
   pJS.fn.canvasInit = function(){
@@ -287,13 +289,15 @@ var pJS = function (tag_id, params) {
         }
       }
 
-        } else if (color.value == 'random') {
+    }
+    else if(color.value == 'random'){
       this.color.rgb = {
         r: (Math.floor(Math.random() * (255 - 0 + 1)) + 0),
         g: (Math.floor(Math.random() * (255 - 0 + 1)) + 0),
         b: (Math.floor(Math.random() * (255 - 0 + 1)) + 0)
       }
-        } else if (typeof (color.value) == 'string') {
+    }
+    else if(typeof(color.value) == 'string'){
       this.color = color;
       this.color.rgb = hexToRgb(this.color.value);
     }
@@ -360,6 +364,7 @@ var pJS = function (tag_id, params) {
     this.vy_i = this.vy;
 
     
+
     /* if shape is image */
 
     var shape_type = pJS.particles.shape.type;
@@ -388,6 +393,7 @@ var pJS = function (tag_id, params) {
     }
 
     
+
   };
 
 
@@ -563,14 +569,16 @@ var pJS = function (tag_id, params) {
       if(p.x - p.radius > pJS.canvas.w){
         p.x = new_pos.x_left;
         p.y = Math.random() * pJS.canvas.h;
-            } else if (p.x + p.radius < 0) {
+      }
+      else if(p.x + p.radius < 0){
         p.x = new_pos.x_right;
         p.y = Math.random() * pJS.canvas.h;
       }
       if(p.y - p.radius > pJS.canvas.h){
         p.y = new_pos.y_top;
         p.x = Math.random() * pJS.canvas.w;
-            } else if (p.y + p.radius < 0) {
+      }
+      else if(p.y + p.radius < 0){
         p.y = new_pos.y_bottom;
         p.x = Math.random() * pJS.canvas.w;
       }
@@ -939,7 +947,10 @@ var pJS = function (tag_id, params) {
         p.y = pos.y;
       }
     
-        } else if (pJS.interactivity.events.onclick.enable && isInArray('repulse', pJS.interactivity.events.onclick.mode)) {
+    }
+
+
+    else if(pJS.interactivity.events.onclick.enable && isInArray('repulse', pJS.interactivity.events.onclick.mode)) {
 
       if(!pJS.tmp.repulse_finish){
         pJS.tmp.repulse_count++;
@@ -1045,6 +1056,7 @@ var pJS = function (tag_id, params) {
   };
 
 
+
   /* ---------- pJS functions - vendors ------------ */
 
   pJS.fn.vendors.eventsListeners = function(){
@@ -1066,7 +1078,8 @@ var pJS = function (tag_id, params) {
         if(pJS.interactivity.el == window){
           var pos_x = e.clientX,
               pos_y = e.clientY;
-                } else {
+        }
+        else{
           var pos_x = e.offsetX || e.clientX,
               pos_y = e.offsetY || e.clientY;
         }
@@ -1113,7 +1126,8 @@ var pJS = function (tag_id, params) {
               }else{
                 if(pJS.interactivity.modes.push.particles_nb == 1){
                   pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb, pJS.interactivity.mouse);
-                                } else if (pJS.interactivity.modes.push.particles_nb > 1) {
+                }
+                else if(pJS.interactivity.modes.push.particles_nb > 1){
                   pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb);
                 }
               }
@@ -1384,6 +1398,8 @@ var pJS = function (tag_id, params) {
   };
 
 
+
+
   /* ---------- pJS - start ------------ */
 
 
@@ -1392,6 +1408,7 @@ var pJS = function (tag_id, params) {
   pJS.fn.vendors.start();
   
 
+
 };
 
 /* ---------- global functions - vendors ------------ */

knockoutwhistweb/public/javascripts/websocket.js

@@ -1,192 +0,0 @@
-// 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 = (result) => {
-                const response = {id: id, event: eventType, status: result};
-                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
-                console.warn("No handler for event:", eventType);
-                sendResponse({error: "No handler for event: " + eventType});
-                return;
-            }
-
-            try {
-                Promise.resolve(handler(data === undefined ? {} : data))
-                    .then(_ => sendResponse("success"))
-                    .catch(_ => sendResponse("error"));
-            } catch (err) {
-                sendResponse("error");
-            }
-        }
-    };
-
-    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;

versions.env

@@ -1,3 +1,3 @@
-MAJOR=4
+MAJOR=1
-MINOR=2
+MINOR=1
 PATCH=0