feat(ci): Polling

Added polling for when the game starts and a card gets played

CHANGELOG.md

@@ -111,25 +111,3 @@
 
 * removed trailing ([c7dd72e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c7dd72ecc2786ef63daf2b4288093025a8e22bfd))
 * removed trailing ([42a5adb](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/42a5adbae01802587a48a9de15bad44b5ef014cf))
-##  (2025-11-20)
-
-### ⚠ BREAKING CHANGES
-
-* **game:** Fixed polling, SPA, Gameplayloop etc. (#59)
-
-### Features
-
-* **ci:** Polling ([370de17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/370de175db65edf87e7ab211190977b540a39d85))
-* **ci:** Polling  Added polling for when the game starts and a card gets played ([#58](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/58)) ([e60fe7c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e60fe7c98dcab05949140a8a54ed6e4e2fbbc022))
-* **game:** Fixed polling, SPA, Gameplayloop etc. ([#59](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/59)) ([a58b2e0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/a58b2e03b11a54667d63ba6604f579a8e328c9d1))
-* **ui:** added js routing, updated ingame ui, added tricktable ([#50](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/50)) ([c220e54](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c220e54bb8d87f4f0f37a089bcd993e8df806123)), closes [#43](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/43) [#43](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/43)
-* **ui:** implement tie & trump menu, fixed some critical bugs ([#52](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/52)) ([5d245d0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/5d245d0011a5fb03193514303b45702cd8329224))
-
-### Bug Fixes
-
-* **polling:** Improve polling mechanism and delay handling ([#60](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/60)) ([641c892](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/641c892981649eb85640527cc0fe325ff683fa77))
-##  (2025-11-22)
-
-### Bug Fixes
-
-* **api:** Fixed a bug where the game would reload on game start ([#81](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/81)) ([9738a04](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/9738a04b7a3c63c8cd1450e563ec04823fb3c35a))

knockoutwhistweb/app/assets/stylesheets/main.less

@@ -25,8 +25,6 @@
 
 .game-field-background {
     background-image: @background-image;
-    background-repeat: no-repeat;
-    background-size: cover;
     max-width: 1400px;
     margin: 0 auto;
     min-height: 100vh;
@@ -49,16 +47,6 @@
   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;
@@ -91,14 +79,6 @@ body {
     overflow: auto;
 }
 
-.navbar-drop-shadow {
-    box-shadow: 0 1px 15px 0 #000000
-}
-
-.ingame-side-shadow {
-  box-shadow: 0 1px 15px 0 #000000
-}
-
 #sessions {
     display: flex;
     flex-direction: column;
@@ -133,9 +113,12 @@ body {
     font-size: 40px;
     font-family: Arial, serif;
 }
-
+#playercards {
-.ingame-cards-slide {
+    display: flex;
-  div {
+    flex-direction: row;
+    justify-content: center;
+    height: 20%;
+    img {
         animation: slideIn 0.5s ease-out forwards;
         animation-fill-mode: backwards;
         &:nth-child(1) { animation-delay: 0.5s; }
@@ -147,7 +130,28 @@ body {
         &:nth-child(7) { animation-delay: 3.5s; }
     }
 }
+#card-slide {
+    div {
+        animation: slideIn 0.5s ease-out forwards;
+        animation-fill-mode: backwards;
+        &:nth-child(1) { animation-delay: 0.5s; }
+        &:nth-child(2) { animation-delay: 1s; }
+        &:nth-child(3) { animation-delay: 1.5s; }
+        &:nth-child(4) { animation-delay: 2s; }
+        &:nth-child(5) { animation-delay: 2.5s; }
+        &:nth-child(6) { animation-delay: 3s; }
+        &:nth-child(7) { animation-delay: 3.5s; }
+    }
 
+
+}
+
+#cardsplayed {
+    display: flex;
+    flex-direction: row;
+    height: 10%;
+    min-height: 10%
+}
 #playedcardplayer {
     display: flex;
     flex-direction: column;
@@ -221,35 +225,3 @@ body {
 .score-row {
     color: #000000;
 }
-
-/* In-game centered stage and blurred sides overlay */
-.ingame-stage {
-  min-height: 100vh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 2rem 1rem;
-}
-
-/* Wrapper that adds a backdrop blur to the background outside the centered card */
-.blur-sides {
-  position: relative;
-}
-
-/* Create an overlay that blurs everything behind it, except the central content area */
-.blur-sides::before {
-  content: "";
-  position: fixed;
-  inset: 0;
-  pointer-events: none;
-  /* fallback: subtle vignette if backdrop-filter unsupported */
-  background: radial-gradient(ellipse at center, rgba(0,0,0,0) 30%, rgba(0,0,0,0.35) 100%);
-}
-
-@supports ((-webkit-backdrop-filter: blur(8px)) or (backdrop-filter: blur(8px))) {
-  .blur-sides::before {
-    background: rgba(0,0,0,0.08);
-    -webkit-backdrop-filter: blur(10px) saturate(110%);
-    backdrop-filter: blur(10px) saturate(110%);
-  }
-}

knockoutwhistweb/app/components/WebApplicationConfiguration.scala

@@ -2,12 +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(DelayHandler)
+  override def listener: Set[EventListener] = Set()
 
 }

knockoutwhistweb/app/controllers/IngameController.scala

@@ -1,22 +1,25 @@
 package controllers
 
 import auth.{AuthAction, AuthenticatedRequest}
-import de.knockoutwhist.control.GameState.{FinishedMatch, InGame, Lobby, SelectTrump, TieBreak}
+import de.knockoutwhist.cards.Hand
-import exceptions.*
+import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak}
+import exceptions.{CantPlayCardException, GameFullException, NotEnoughPlayersException, NotHostException, NotInThisGameException}
 import logic.PodManager
-import logic.game.GameLobby
+import logic.game.PollingEvents.CardPlayed
-import model.sessions.UserSession
+import logic.game.PollingEvents.GameStarted
+import logic.game.{GameLobby, PollingEvents}
+import model.sessions.{PlayerSession, UserSession}
 import model.users.User
 import play.api.*
-import play.api.libs.json.{JsValue, Json}
+import play.api.libs.json.{JsArray, JsValue, Json}
 import play.api.mvc.*
-import play.twirl.api.Html
+import util.WebUIUtils
 
 import java.util.UUID
 import javax.inject.*
-import scala.concurrent.ExecutionContext
+import scala.concurrent.Future
 import scala.util.Try
-
+import scala.concurrent.ExecutionContext
 @Singleton
 class IngameController @Inject() (
                                    val cc: ControllerComponents,
@@ -25,49 +28,122 @@ class IngameController @Inject() (
                                    implicit val ec: ExecutionContext
                                  ) extends AbstractController(cc) {
 
-  def returnInnerHTML(gameLobby: GameLobby, user: User): Html = {
+  // --- Helper function (defined outside match/if for scope) ---
-    gameLobby.logic.getCurrentState match {
+  def buildSuccessResponse(game: GameLobby, hand: Option[Hand]): JsValue = {
-      case Lobby => views.html.lobby.lobby(Some(user), gameLobby)
+    // NOTE: Replace the unsafe .get calls here if game state is not guaranteed
-      case InGame =>
+    val currentRound = game.logic.getCurrentRound.get
-        views.html.ingame.ingame(
+    val currentTrick = game.logic.getCurrentTrick.get
-          gameLobby.getPlayerByUser(user),
+
-          gameLobby
+    // JSON Building Logic:
+    val trickCardsJson = Json.toJson(
+      currentTrick.cards.map { case (card, player) =>
+        Json.obj("cardId" -> WebUIUtils.cardtoString(card), "player" -> player.name)
+      }
     )
-      case SelectTrump =>
+    val scoreTableJson = Json.toJson(
-          views.html.ingame.selecttrump(
+      game.getLogic.getPlayerQueue.get.toList.map { player =>
-            gameLobby.getPlayerByUser(user),
+        Json.obj(
-            gameLobby
+          "name" -> player.name,
+          "tricks" -> currentRound.tricklist.count(_.winner.contains(player))
         )
-      case TieBreak =>
+      }
-        views.html.ingame.tie(
-          gameLobby.getPlayerByUser(user),
-          gameLobby
     )
-      case FinishedMatch =>
+
-        views.html.ingame.finishedMatch(
+    val stringHand = hand.map { h =>
-          Some(user),
+      val cardStrings = h.cards.map(WebUIUtils.cardtoString(_))
-          gameLobby
+      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",
+      "handData" -> stringHand,
+      "currentPlayerName" -> game.logic.getCurrentPlayer.get.name,
+      "trumpSuit" -> currentRound.trumpSuit.toString,
+      "trickCards" -> trickCardsJson,
+      "scoreTable" -> scoreTableJson,
+      "firstCardId" -> firstCardId,
+      "nextPlayer" -> nextPlayer
     )
-      case _ =>
+  }
-        throw new IllegalStateException(s"Invalid game state for in-game view. GameId: ${gameLobby.id}" + s" State: ${gameLobby.logic.getCurrentState}")
+
+  def handleEvent(event: PollingEvents, game: GameLobby, user: User): Result = {
+    event match {
+      case CardPlayed =>
+        val player = game.getPlayerByUser(user)
+        val hand = player.currentHand()
+        val jsonResponse = buildSuccessResponse(game, hand)
+        Ok(jsonResponse)
+      case GameStarted =>
+        val jsonResponse = Json.obj(
+          "status" -> "gameStart",
+          "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, request.user))
+        } else {
+
+          val eventPromise = game.registerWaiter(playerId)
+
+          eventPromise.future.map { event =>
+            game.removeWaiter(playerId)
+            handleEvent(event, game, request.user)
+          }.recover {
+            case _: Throwable =>
+              game.removeWaiter(playerId)
+              NoContent
           }
         }
 
+      case None =>
+        // Game not found
+        Future.successful(NotFound("Game not found."))
+    }
+  }
   def game(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
     val game = podManager.getGame(gameId)
     game match {
       case Some(g) =>
-        val results = Try {
+        g.logic.getCurrentState match {
-          returnInnerHTML(g, 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.logic
+            ))
+          case TieBreak =>
+            Ok(views.html.ingame.tie(
+              g.getPlayerByUser(request.user),
+              g.logic
+            ))
+          case _ =>
+            InternalServerError(s"Invalid game state for in-game view. GameId: $gameId" + s" State: ${g.logic.getCurrentState}")
         }
       case None =>
-        Redirect(routes.MainMenuController.mainMenu())
+        NotFound("Game not found")
     }
+    //NotFound(s"Reached end of game method unexpectedly. GameId: $gameId")
   }
   def startGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
     val game = podManager.getGame(gameId)
@@ -82,8 +158,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" -> returnInnerHTML(game.get, request.user).toString()
       ))
     } else {
       val throwable = result.failed.get
@@ -146,7 +221,32 @@ 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)
     game match {
@@ -167,7 +267,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
@@ -192,11 +293,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",
@@ -222,10 +318,7 @@ class IngameController @Inject() (
     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 {
@@ -250,30 +343,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
-              ))
           }
         }
       }
@@ -286,10 +364,7 @@ class IngameController @Inject() (
     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
@@ -306,25 +381,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 =>
@@ -338,10 +401,7 @@ class IngameController @Inject() (
     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
@@ -358,25 +418,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 =>
@@ -387,46 +435,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"
-        ))
-    }
-  }
-
 }

knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala

@@ -12,23 +12,15 @@ class JavaScriptRoutingController  @Inject()(
                                               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.MainMenuController.navSPA,
           routes.javascript.IngameController.startGame,
           routes.javascript.IngameController.kickPlayer,
           routes.javascript.IngameController.leaveGame,
           routes.javascript.IngameController.playCard,
-          routes.javascript.IngameController.playDogCard,
+          routes.javascript.IngameController.polling
-          routes.javascript.IngameController.playTrump,
-          routes.javascript.IngameController.playTie,
-          routes.javascript.IngameController.returnToLobby,
-          routes.javascript.PollingController.polling,
-          routes.javascript.UserController.login_Post
       )
     ).as("text/javascript")
   }

knockoutwhistweb/app/controllers/MainMenuController.scala

@@ -17,13 +17,12 @@ import javax.inject.*
 class MainMenuController @Inject()(
                                     val controllerComponents: ControllerComponents,
                                     val authAction: AuthAction,
-                                    val podManager: PodManager,
+                                    val podManager: PodManager
-                                    val ingameController: IngameController
                                   ) extends BaseController {
 
   // Pass the request-handling function directly to authAction (no nested Action)
   def mainMenu(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    Ok(views.html.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] =>
@@ -46,8 +45,7 @@ class MainMenuController @Inject()(
       )
       Ok(Json.obj(
         "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameLobby.id).url,
+        "redirectUrl" -> routes.IngameController.game(gameLobby.id).url
-        "content" -> ingameController.returnInnerHTML(gameLobby, request.user).toString
       ))
     } else {
       BadRequest(Json.obj(
@@ -59,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, 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

@@ -1,153 +0,0 @@
-package controllers
-
-import auth.{AuthAction, AuthenticatedRequest}
-import controllers.PollingController.{scheduler, timeoutDuration}
-import de.knockoutwhist.cards.Hand
-import de.knockoutwhist.player.AbstractPlayer
-import logic.PodManager
-import logic.game.{GameLobby, PollingEvents}
-import logic.game.PollingEvents.{CardPlayed, LobbyCreation, LobbyUpdate, NewRound, NewTrick, 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}
-import java.util.concurrent.{Executors, ScheduledExecutorService, TimeUnit}
-import scala.concurrent.duration.*
-object PollingController {
-  private val scheduler: ScheduledExecutorService = Executors.newSingleThreadScheduledExecutor()
-  private val timeoutDuration = 25.seconds
-}
-@Singleton
-class PollingController @Inject() (
-                                    val cc: ControllerComponents,
-                                    val podManager: PodManager,
-                                    val authAction: AuthAction,
-                                    val ingameController: IngameController,
-                                    implicit val ec: ExecutionContext
-                                  ) extends AbstractController(cc) {
-
-  private def buildCardPlayResponse(game: GameLobby, hand: Option[Hand], player: AbstractPlayer, 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,
-      "dog" -> player.isInDogLife,
-      "currentPlayerName" -> game.logic.getCurrentPlayer.get.name,
-      "trumpSuit" -> currentRound.trumpSuit.toString,
-      "trickCards" -> trickCardsJson,
-      "scoreTable" -> scoreTableJson,
-      "firstCardId" -> firstCardId,
-      "nextPlayer" -> nextPlayer,
-      "yourTurn" -> (game.logic.getCurrentPlayer.get == player)
-    )
-  }
-
-  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)
-      )),
-      "maxPlayers" -> game.maxPlayers
-    )
-  }
-
-
-  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, player, true)
-        Ok(jsonResponse)
-      case NewTrick =>
-        val player = game.getPlayerByUser(userSession.user)
-        val hand = player.currentHand()
-        val jsonResponse = buildCardPlayResponse(game, hand, player, false)
-        Ok(jsonResponse)
-      case CardPlayed =>
-        val player = game.getPlayerByUser(userSession.user)
-        val hand = player.currentHand()
-        val jsonResponse = buildCardPlayResponse(game, hand, player, false)
-        Ok(jsonResponse)
-      case LobbyUpdate =>
-        Ok(buildLobbyUsersResponse(game, userSession))
-      case ReloadEvent =>
-        val jsonResponse = Json.obj(
-          "status" -> "reloadEvent",
-          "redirectUrl" -> routes.IngameController.game(game.id).url,
-          "content" -> ingameController.returnInnerHTML(game, userSession.user).toString
-        )
-        Ok(jsonResponse)
-    }
-  }
-
-  def polling(gameId: String): Action[AnyContent] = authAction.async { implicit request: AuthenticatedRequest[AnyContent] =>
-
-    val playerId = request.user.id
-
-    podManager.getGame(gameId) match {
-      case Some(game) =>
-        val playerEventQueue = game.getEventsOfPlayer(playerId)
-        if (playerEventQueue.nonEmpty) {
-          val event = playerEventQueue.dequeue()
-          Future.successful(handleEvent(event, game, game.getUserSession(playerId)))
-        } else {
-          val eventPromise = game.registerWaiter(playerId)
-          val scheduledFuture = scheduler.schedule(
-            new Runnable {
-              override def run(): Unit =
-                eventPromise.tryFailure(new java.util.concurrent.TimeoutException("Polling Timeout"))
-            },
-            timeoutDuration.toMillis,
-            TimeUnit.MILLISECONDS
-          )
-          eventPromise.future.map { event =>
-            scheduledFuture.cancel(false)
-            game.removeWaiter(playerId)
-            handleEvent(event, game, game.getUserSession(playerId))
-          }.recover {
-            case _: Throwable =>
-              game.removeWaiter(playerId)
-              NoContent
-          }
-        }
-
-      case None =>
-        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/logic/game/GameLobby.scala

@@ -4,22 +4,21 @@ import de.knockoutwhist.cards.{Hand, Suit}
 import de.knockoutwhist.control.GameLogic
 import de.knockoutwhist.control.GameState.{InGame, Lobby, MainMenu}
 import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.{MatchUtil, PlayerUtil}
-import de.knockoutwhist.events.global.tie.TieTurnEvent
+import de.knockoutwhist.events.global.{CardPlayedEvent, GameStateChangeEvent, SessionClosed}
-import de.knockoutwhist.events.global.{CardPlayedEvent, GameStateChangeEvent, NewTrickEvent, 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.game.PollingEvents.{CardPlayed, LobbyCreation, LobbyUpdate, NewRound, NewTrick, ReloadEvent}
+import logic.game.PollingEvents.{CardPlayed, GameStarted}
 import model.sessions.{InteractionType, UserSession}
 import model.users.User
 
 import java.util.UUID
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
-import scala.concurrent.Promise as ScalaPromise
+import scala.concurrent.{Promise => ScalaPromise}
 
 class GameLobby private(
                  val logic: GameLogic,
@@ -28,40 +27,22 @@ class GameLobby private(
                  val name: String,
                  val maxPlayers: Int
                ) extends EventListener {
-
-
-
-  private val users: mutable.Map[UUID, UserSession] = mutable.Map()
-  private val eventsPerPlayer: mutable.Map[UUID, mutable.Queue[PollingEvents]] = mutable.Map()
-  private val waitingPromises: mutable.Map[UUID, ScalaPromise[PollingEvents]] = mutable.Map()
-  private val lock = new Object
-  lock.synchronized {
   logic.addListener(this)
   logic.createSession()
-  }
 
+  private val users: mutable.Map[UUID, UserSession] = mutable.Map()
+  private var 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]()
-    lock.synchronized {
-      val queue = eventsPerPlayer.getOrElseUpdate(playerId, mutable.Queue())
-
-      if (queue.nonEmpty) {
-        val evt = queue.dequeue()
-        promise.success(evt)
-        promise
-      } else {
     waitingPromises.put(playerId, promise)
     promise
   }
-    }
-  }
 
   def removeWaiter(playerId: UUID): Unit = {
-    lock.synchronized {
     waitingPromises.remove(playerId)
   }
-  }
 
   def addUser(user: User): UserSession = {
     if (users.size >= maxPlayers) throw new GameFullException("The game is full!")
@@ -72,29 +53,34 @@ class GameLobby private(
       host = false
     )
     users += (user.id -> userSession)
-    addToQueue(LobbyUpdate)
     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)
+        val newEvent = PollingEvents.CardPlayed
-      case event: TieTurnEvent =>
+        if (waitingPromises.nonEmpty) {
-        addToQueue(ReloadEvent)
+          waitingPromises.values.foreach(_.success(newEvent))
-        users.get(event.player.id).foreach(session => session.updatePlayer(event))
+          waitingPromises.clear()
+        } else {
+          pollingState.enqueue(newEvent)
+        }
       case event: PlayerEvent =>
         users.get(event.playerId).foreach(session => session.updatePlayer(event))
-      case event: NewTrickEvent =>
-        addToQueue(NewTrick)
       case event: GameStateChangeEvent =>
         if (event.oldState == MainMenu && event.newState == Lobby) {
           return
         }
-        addToQueue(ReloadEvent)
+        if (event.oldState == Lobby && event.newState == InGame) {
+          val newEvent = PollingEvents.GameStarted
+          if (waitingPromises.nonEmpty) {
+            waitingPromises.values.foreach(_.success(newEvent))
+            waitingPromises.clear()
+          } else {
+            pollingState.enqueue(newEvent)
+          }
+        }
         users.values.foreach(session => session.updatePlayer(event))
       case event: SessionClosed =>
         users.values.foreach(session => session.updatePlayer(event))
@@ -103,24 +89,6 @@ class GameLobby private(
     }
   }
 
-  private def addToQueue(event: PollingEvents): Unit = {
-    lock.synchronized {
-      users.keys.foreach { playerId =>
-        val q = eventsPerPlayer.getOrElseUpdate(playerId, mutable.Queue())
-        q.enqueue(event)
-      }
-      val waiterIds = waitingPromises.keys.toList
-      waiterIds.foreach { playerId =>
-        val q = eventsPerPlayer.getOrElseUpdate(playerId, mutable.Queue())
-        if (q.nonEmpty) {
-          val evt = q.dequeue()
-          val p = waitingPromises.remove(playerId)
-          p.foreach(_.success(evt))
-        }
-      }
-    }
-  }
-
   /**
    * Start the game if the user is the host.
    * @param user the user who wants to start the game.
@@ -157,7 +125,6 @@ class GameLobby private(
       throw new NotInThisGameException("You are not in this game!")
     }
     users.remove(userId)
-    addToQueue(LobbyUpdate)
   }
 
   /**
@@ -190,11 +157,10 @@ class GameLobby private(
       throw new CantPlayCardException("You are not in dog life!")
     }
     if (cardIndex == -1) {
-      if (MatchUtil.dogNeedsToPlay(getMatch, getRound)) {
+      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)
@@ -226,19 +192,6 @@ class GameLobby private(
     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()
-  }
-
   
   //-------------------
   
@@ -261,8 +214,8 @@ class GameLobby private(
   def getLogic: GameLogic = {
     logic
   }
-  def getEventsOfPlayer(playerId: UUID): mutable.Queue[PollingEvents] = {
+  def getPollingState: mutable.Queue[PollingEvents] = {
-    eventsPerPlayer.getOrElseUpdate(playerId, mutable.Queue())
+    pollingState
   }
   private def getPlayerBySession(userSession: UserSession): AbstractPlayer = {
     val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
@@ -314,10 +267,6 @@ class GameLobby private(
     trickOpt.get
   }
   
-  def getUsers: Set[User] = {
-    users.values.map(d => d.user).toSet
-  }
-
 }
 
 object GameLobby {

knockoutwhistweb/app/logic/game/PollingEvents.scala

@@ -2,9 +2,5 @@ package logic.game
 
 enum PollingEvents {
   case CardPlayed
-  case NewRound
+  case GameStarted
-  case NewTrick
-  case ReloadEvent
-  case LobbyUpdate
-  case LobbyCreation
 }

knockoutwhistweb/app/model/sessions/UserSession.scala

@@ -7,7 +7,7 @@ import model.users.User
 import java.util.UUID
 import java.util.concurrent.locks.{Lock, ReentrantLock}
 
-class UserSession(val user: User, val host: Boolean) extends PlayerSession {
+class UserSession(user: User, val host: Boolean) extends PlayerSession {
   var canInteract: Option[InteractionType] = None
   val lock: ReentrantLock = ReentrantLock()
 

knockoutwhistweb/app/util/WebUIUtils.scala

@@ -8,10 +8,6 @@ import scalafx.scene.image.Image
 
 object WebUIUtils {
   def cardtoImage(card: Card): Html = {
-    views.html.render.card.apply(f"images/cards/${cardtoString(card)}.png")(card.toString)
-  }
-
-  def cardtoString(card: Card) = {
     val s = card.suit match {
       case Spades => "S"
       case Hearts => "H"
@@ -33,7 +29,6 @@ object WebUIUtils {
       case Three => "3"
       case Two => "2"
     }
-    f"$cv$s"
+    views.html.render.card.apply(f"images/cards/$cv$s.png")(card.toString)
   }
-
 }

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

@@ -1,37 +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'));
-</script>

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

@@ -1,10 +1,10 @@
 @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">
+    <main class="game-field-background vh-100">
         <div class="py-5 container-xxl">
 
             <div class="row ms-4 me-4">
@@ -72,19 +72,12 @@
             </div>
 
             <div class="row justify-content-center g-2 mt-4 bottom-div" style="backdrop-filter: blur(4px); margin-left: 0; margin-right: 0;">
-                <div class="row justify-content-center ingame-cards-slide @{
+                <div class="row justify-content-center" id="card-slide">
-                    !gamelobby.logic.getCurrentPlayer.contains(player) ? "inactive" |: ""
-                }" id="card-slide">
                     @for(i <- player.currentHand().get.cards.indices) {
                     <div class="col-auto handcard" style="border-radius: 6px">
-                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-card-id="@i" style="border-radius: 6px" onclick="handlePlayCard(this, '@gamelobby.id', '@player.isInDogLife')">
+                            <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>
@@ -93,15 +86,8 @@
     </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'));
 </script>
+}

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

@@ -1,71 +1,27 @@
-@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
+@(player: de.knockoutwhist.player.AbstractPlayer, logic: de.knockoutwhist.control.GameLogic)
 
+@main("Selecting Trumpsuit...") {
 <div id="selecttrumpsuit" class="game-field game-field-background">
-    <div class="ingame-stage blur-sides">
+    @if(player.equals(logic.getCurrentMatch.get.roundlist.last.winner.get)) {
-        <div class="container py-4">
+        <h1>Knockout Whist</h1>
-            <div class="row justify-content-center">
+        <p>You (@player.toString) have won the last round! Select a trumpsuit for the next round!</p>
-                <div class="col-12">
+        <p>Available trumpsuits are displayed below:</p>
-                    <div class="card shadow-sm">
+        <div id="playercards">
-                        <div class="card-header text-center">
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades))
-                            <h3 class="mb-0">Select Trump Suit</h3>
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs))
-                        </div>
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts))
-                        <div class="card-body">
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds))
-                            @if(player.equals(gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get)) {
-                                <div class="alert alert-info" role="alert" aria-live="polite">
-                                    You (@player.toString) won the last round. Choose the trump suit for the next round.
         </div>
+        <p>Your cards</p>
 
-                                <div class="row justify-content-center col-auto mb-5">
+        <div id="playercards">
-                                    <div class="col-auto handcard">
+            @for(card <- player.currentHand().get.cards) {
-                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="0" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
+            @util.WebUIUtils.cardtoImage(card)
-                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades)) width="120px" style="border-radius: 6px"/>
-                                        </div>
-                                    </div>
-                                    <div class="col-auto handcard">
-                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="1" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
-                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts)) width="120px" style="border-radius: 6px"/>
-                                        </div>
-                                    </div>
-                                    <div class="col-auto handcard">
-                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="2" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
-                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds)) width="120px" style="border-radius: 6px"/>
-                                        </div>
-                                    </div>
-                                    <div class="col-auto handcard">
-                                        <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="3" style="border-radius: 6px" onclick="handleTrumpSelection(this, '@gamelobby.id')">
-                                            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs)) width="120px" style="border-radius: 6px"/>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row justify-content-center ingame-cards-slide" id="card-slide">
-                                    @for(i <- player.currentHand().get.cards.indices) {
-                                        <div class="col-auto" style="border-radius: 6px">
-                                            @util.WebUIUtils.cardtoImage(player.currentHand().get.cards(i)) width="120px" style="border-radius: 6px"/>
-                                        </div>
             }
         </div>
     } else {
-                                <div class="alert alert-warning" role="alert" aria-live="polite">
+    <h1>Knockout Whist</h1>
-                                    @gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get.name is choosing a trumpsuit. The new round will start once a suit is picked.
+    <p>@player.toString is choosing a trumpsuit. Starting new round when @player.toString picked a trumpsuit...</p>
-                                </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'));
-</script>

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

@@ -1,117 +1,27 @@
-@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
+@(player: de.knockoutwhist.player.AbstractPlayer, logic: de.knockoutwhist.control.GameLogic)
+
+@main("Tie") {
 <div id="tie" class="game-field game-field-background">
-    <div class="ingame-stage blur-sides">
+    <h1>Knockout Whist</h1>
-        <div class="container py-4">
+    <p>The last Round was tied between
-            <div class="row justify-content-center">
+    @for(players <- logic.playerTieLogic.getTiedPlayers) {
-                <div class="col-12 col-md-10 col-lg-8">
+        @players
-                    <div class="card shadow-sm">
-                        <div class="card-header text-center">
-                            <h3 class="mb-0">Tie Break</h3>
-                        </div>
-                        <div class="card-body">
-                            <div class="mb-3">
-                                <p class="card-text">
-                                    The last round was tied between:
-                                    <span class="ms-1">
-                                    @for(players <- gamelobby.logic.playerTieLogic.getTiedPlayers) {
-                                        <span class="badge text-bg-secondary me-1">@players</span>
     }
-                                    </span>
     </p>
-                            </div>
+    @if(player.equals(logic.playerTieLogic.currentTiePlayer())) {
-
+        <p>Pick a card between 1 and @logic.playerTieLogic.highestAllowedNumber()! The resulting card will be your card for the cut.</p>
-                            @if(player.equals(gamelobby.logic.playerTieLogic.currentTiePlayer())) {
+    } else {
-                                @defining(gamelobby.logic.playerTieLogic.highestAllowedNumber()) { maxNum =>
+        <p>@logic.playerTieLogic.currentTiePlayer() is currently picking his number for the cut.</p>
-                                    <div class="alert alert-info" role="alert" aria-live="polite">
+        <p>Currently picked Cards:</p>
-                                        Pick a number between 1 and @{maxNum + 1}. The resulting card will be your card for the cut.
+        <div id="cardsplayed">
-                                    </div>
+            @for((player, card) <- logic.playerTieLogic.getSelectedCard) {
-
+            <div id="playedcardplayer">
-                                    <div class="row g-2 align-items-center">
+                <p>@player</p>
-                                        <div class="col-auto">
-                                            <label for="tieNumber" class="col-form-label">Your number</label>
-                                        </div>
-                                        <div class="col-auto">
-                                            <input type="number" id="tieNumber" class="form-control" name="tie" min="1" max="@{maxNum + 1}" placeholder="1" required>
-                                        </div>
-                                        <div class="col-auto">
-                                            <button onclick="selectTie('@gamelobby.id')" class="btn btn-primary">Confirm</button>
-                                        </div>
-                                    </div>
-                                    <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
-
-                                    <div id="cardsplayed" class="row g-3 justify-content-center">
-                                        @if(gamelobby.logic.playerTieLogic.getSelectedCard.nonEmpty) {
-                                            @for((player, card) <- gamelobby.logic.playerTieLogic.getSelectedCard) {
-                                                <div class="col-6">
-                                                    <div class="card shadow-sm border-0 h-100 text-center">
-                                                        <div class="card-body d-flex flex-column justify-content-between">
-                                                            <p class="card-text fw-semibold mb-2 text-primary">@player</p>
-                                                            <div class="card-img-top">
                 @util.WebUIUtils.cardtoImage(card)
             </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            }
-                                        } else {
-                                            <div class="col-12">
-                                                <div class="alert alert-info text-center" role="alert">
-                                                    <i class="bi bi-info-circle me-2"></i>
-                                                    No cards have been selected yet.
-                                                </div>
-                                            </div>
-                                        }
-                                    </div>
-                                }
-                            } else {
-                                <div class="alert alert-warning" role="alert" aria-live="polite">
-                                    <strong>@gamelobby.logic.playerTieLogic.currentTiePlayer()</strong> is currently picking a number for the cut.
-                                </div>
-
-                                <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
-
-                                <div id="cardsplayed" class="row g-3 justify-content-center">
-                                    @if(gamelobby.logic.playerTieLogic.getSelectedCard.nonEmpty) {
-                                        @for((player, card) <- gamelobby.logic.playerTieLogic.getSelectedCard) {
-                                            <div class="col-6 col-sm-4 col-md-3 col-lg-2">
-                                                <div class="card shadow-sm border-0 h-100 text-center">
-                                                    <div class="card-body d-flex flex-column justify-content-between">
-                                                        <p class="card-text fw-semibold mb-2 text-primary">@player</p>
-                                                        <div class="card-img-top">
-                                                        @util.WebUIUtils.cardtoImage(card)
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        }
-                                    } else {
-                                        <div class="col-12">
-                                            <div class="alert alert-info text-center" role="alert">
-                                                <i class="bi bi-info-circle me-2"></i>
-                                                No cards have been selected yet.
-                                            </div>
-                                        </div>
             }
         </div>
     }
 
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 </div>
-<script>
+}
-        function waitForFunction(name, checkInterval = 100) {
-            return new Promise(resolve => {
-                const timer = setInterval(() => {
-                    if (typeof window[name] === "function") {
-                        clearInterval(timer);
-                        resolve(window[name]);
-                    }
-                }, checkInterval);
-            });
-        }
-        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
-</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,36 +15,35 @@
         </div>
         <div class="row">
             <div class="col">
-                <div class="p-3 text-center fs-4" id="playerAmount">Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
+                <div class="p-3 text-center fs-4">Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
             </div>
         </div>
         <div class="row justify-content-center align-items-center flex-grow-1">
             @if((gamelobby.getUserSession(user.get.id).host)) {
-            <div id="players" class="justify-content-center align-items-center d-flex">
                 @for(playersession <- gamelobby.getPlayers.values) {
-                <div class="col-auto my-auto m-3">
+                    <div class="col-auto my-auto">
                         <div class="card" style="width: 18rem;">
                             <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
                             <div class="card-body">
                                 @if(playersession.id == user.get.id) {
                                     <h5 class="card-title">@playersession.name (You)</h5>
+    @*                                <p class="card-text">Your text could be here!</p>*@
                                     <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
                                 } else {
                                     <h5 class="card-title">@playersession.name</h5>
+    @*                                <p class="card-text">Your text could be here!</p>*@
                                     <div class="btn btn-danger" onclick="removePlayer('@gamelobby.id', '@playersession.id')">Remove</div>
                                 }
                             </div>
                         </div>
                     </div>
                 }
-            </div>
                 <div class="col-12 text-center mb-5">
                     <div class="btn btn-success" onclick="startGame('@gamelobby.id')">Start Game</div>
                 </div>
             } else {
-            <div id="players" class="justify-content-center align-items-center d-flex">
                 @for(playersession <- gamelobby.getPlayers.values) {
-                <div class="col-auto my-auto m-3"> <div class="card" style="width: 18rem;">
+                    <div class="col-auto my-auto"> <div class="card" style="width: 18rem;">
                         <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
                         <div class="card-body">
                             @if(playersession.id == user.get.id) {
@@ -55,7 +55,7 @@
                         </div>
                     </div>
                 }
-            </div>
+
                 <div class="col-12 text-center mt-3">
                     <p class="fs-4">Waiting for the host to start the game...</p>
                     <div class="spinner-border mt-1" role="status">
@@ -67,15 +67,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'));
 </script>
+}

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

@@ -1,9 +1,13 @@
 @()
-<div class="login-box">
+
+@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>
@@ -18,7 +22,7 @@
                         <a href="#" class="text-decoration-none">Forgot password?</a>
                     </div>
 
-                <div class="d-grid" >
+                    <div class="d-grid">
                         <button type="submit" class="btn btn-primary">Login</button>
                     </div>
                 </form>
@@ -29,14 +33,15 @@
                 </p>
             </div>
         </div>
-</div>
+    </div>
-<script src="@routes.Assets.versioned("/javascripts/particles.js")"></script>
+    <script src="@routes.Assets.versioned("/javascripts/particles.js")"></script>
-<script>
+    <script>
             particlesJS.load('particles-js', 'assets/conf/particlesjs-config.json', function() {
                 console.log('callback - particles.js config loaded');
             });
-</script>
+    </script>
-<div id="particles-js" style="background-color: rgb(11, 8, 8);
+    <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,13 +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>
 
-    <body class="d-flex flex-column min-vh-100" id="main-body">
+    <body class="d-flex flex-column min-vh-100">
             @* And here's where we render the `Html` object containing
              * the page content. *@
             @content
-    </body>
         <script src="@routes.JavaScriptRoutingController.javascriptRoutes()" type="text/javascript"></script>
         <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script>
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    </body>
 </html>

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

@@ -1,8 +1,9 @@
 @(user: Option[model.users.User])
 
+@main("Create Game") {
 @navbar(user)
 <main class="lobby-background flex-grow-1">
-    <div class="w-25 mx-auto">
+    <div class="w-50 mx-auto">
         <div class="mt-3">
             <label for="lobbyname" class="form-label">Lobby-Name</label>
             <input type="text" class="form-control" id="lobbyname" name="lobbyname" placeholder="Lobby 1" required>
@@ -28,3 +29,4 @@
         </div>
     </div>
 </main>
+}

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

@@ -1,6 +1,6 @@
 @(user: Option[model.users.User])
-    <nav class="navbar navbar-expand-lg bg-body-tertiary navbar-drop-shadow">
+    <nav class="navbar navbar-expand-lg bg-body-tertiary">
-        <div class="container d-flex justify-content-start">
+        <div class="container d-flex justify-content-left">
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
@@ -13,18 +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()">Create Game</a>
+                                <a class="nav-link active" aria-current="page" href="@routes.MainMenuController.mainMenu()">Create Game</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link disabled" aria-disabled="true">Lobbies</a>
                             </li>
                         }
                         <li class="nav-item">
-                            <a class="nav-link active" onclick="navSpa('1', 'Knockout Whist - Rules'); return false;" href="@routes.MainMenuController.rules()">Rules</a>
+                            <a class="nav-link active" href="@routes.MainMenuController.rules()">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>

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

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

knockoutwhistweb/conf/routes

@@ -12,7 +12,6 @@ GET     /assets/*file                       controllers.Assets.versioned(path="/
 # 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,17 +24,10 @@ GET     /logout                             controllers.UserController.logout()
 
 # In-game routes
 GET    /game/:id                    controllers.IngameController.game(id: String)
-POST    /game/:id/start                      controllers.IngameController.startGame(id: String)
+GET    /game/:id/join               controllers.IngameController.joinGame(id: String)
-POST    /game/:id/kickPlayer/:playerToKick  controllers.IngameController.kickPlayer(id: String, playerToKick: String)
+GET    /game/:id/start              controllers.IngameController.startGame(id: String)
-
+POST    /game/:id/kickPlayer         controllers.IngameController.kickPlayer(id: String, playerId: String)
-POST    /game/:id/trump                     controllers.IngameController.playTrump(id: String)
-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)
-POST   /game/:id/dogPlayCard                controllers.IngameController.playDogCard(id: String)
-
-POST   /game/:id/returnToLobby              controllers.IngameController.returnToLobby(id: String)
-
 # Polling
-GET    /polling/:gameId                     controllers.PollingController.polling(gameId: String)
+GET    /polling                    controllers.IngameController.polling(gameId: String)

knockoutwhistweb/public/javascripts/main.js

@@ -79,50 +79,39 @@
     })
 })()
 
-let polling = false;
 function pollForUpdates(gameId) {
-    if (polling) {
-        console.log("[DEBUG] Polling already in progress. Skipping this cycle.");
-        return;
-    }
-    polling = true;
-    console.log(`[DEBUG] Starting poll cycle for Game ID: ${gameId} at ${new Date().toISOString()}`);
     if (!gameId) {
-        console.error("[DEBUG] Game ID is missing. Stopping poll.");
+        console.error("Game ID is missing. Stopping poll.");
         return;
     }
-    const $handElement = $('#card-slide');
+    const element = document.getElementById('card-slide');
-    const $lobbyElement = $('#lobbybackground');
+    const element2 = document.getElementById('lobbybackground');
-    const $mainmenuElement = $('#main-menu-screen')
+    // Safety check for the target element
-    const $mainbody = $('#main-body')
+    if (!element && !element2) {
-    if (!$handElement.length && !$lobbyElement.length && !$mainmenuElement.length && !$mainbody.length) {
+        console.error("Polling target element not found. Stopping poll.");
-        setTimeout(() => { polling = false; pollForUpdates(gameId) }, 1000);
+        // 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);
+    const route = jsRoutes.controllers.IngameController.polling(gameId);
-    $.ajax({
+
-        url: route.url,
+    // Call your specific controller endpoint
-        type: 'GET',
+    fetch(route.url)
-        dataType: 'json',
+        .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 => {
 
-        success: (data => {
-            if (!data) {
-                console.log("[DEBUG] Received 204 No Content (Timeout). Restarting poll.");
-                return;
-            }
                     if (data.status === "cardPlayed" && data.handData) {
                         console.log("Event received: Card played. Redrawing hand.");
+
                         const newHand = data.handData;
                         let newHandHTML = '';
-                $handElement.empty();
+                        element.innerHTML = '';
-
-                if(data.animation) {
-                        $handElement.addClass('ingame-cards-slide');
-                } else {
-                    $handElement.removeClass('ingame-cards-slide');
-                }
-
-                const dog = data.dog;
 
                         newHand.forEach((cardId, index) => {
                             const cardHtml = `
@@ -130,7 +119,7 @@ function pollForUpdates(gameId) {
                                     <div class="btn btn-outline-light p-0 border-0 shadow-none" 
                                          data-card-id="${index}" 
                                          style="border-radius: 6px" 
-                                 onclick="handlePlayCard(this, '${gameId}', '${dog}')">
+                                         onclick="handlePlayCard(this, '${gameId}')">
                                         
                                         <img src="/assets/images/cards/${cardId}.png" width="120px" style="border-radius: 6px"/>
                                     </div>
@@ -139,35 +128,32 @@ function pollForUpdates(gameId) {
                             newHandHTML += cardHtml;
                         });
 
-                if (dog) {
+                        element.innerHTML = newHandHTML;
-                    newHandHTML += `
+
-                        <div class="mt-2">
+                        const currentPlayerElement = document.getElementById('current-player-name');
-                            <button class="btn btn-danger" onclick="handleSkipDogLife(this, '${gameId}')">Skip Dog Life</button>
+                        if (currentPlayerElement) {
-                        </div>
+                            currentPlayerElement.textContent = data.currentPlayerName;
-                    `;
                         }
-
+                        const nextPlayerElement = document.getElementById('next-player-name');
-                $handElement.html(newHandHTML);
+                        if (nextPlayerElement && data.nextPlayer) {
-
+                            // Use the correctly named field from the server response
-                if (data.yourTurn) {
+                            nextPlayerElement.textContent = data.nextPlayer;
-                    $handElement.removeClass('inactive');
                         } else {
-                    $handElement.addClass('inactive');
+                            // Case 2: Player name is empty or null (signal to clear display).
+                            nextPlayerElement.textContent = "";
                         }
 
-                $('#current-player-name').text(data.currentPlayerName)
+                        const trumpElement = document.getElementById('trump-suit');
-                if (data.nextPlayer) {
+                        if (trumpElement) {
-                    $('#next-player-name').text(data.nextPlayer);
+                            trumpElement.textContent = data.trumpSuit;
-                } else if (nextPlayerElement) {
-                    $('#next-player-name').text("");
-                } else {
-                    console.warn("[DEBUG] 'current-player-name' element missing in DOM");
                         }
-                    $('#trump-suit').text(data.trumpSuit);
+                        const trickContainer = document.getElementById('trick-cards-container');
-                if ($('#trick-cards-container').length) {
+                        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);">
@@ -181,9 +167,10 @@ function pollForUpdates(gameId) {
                                     </div>
                                 `;
                             });
-                    $('#trick-cards-container').html(trickHTML);
+                            trickContainer.innerHTML = trickHTML;
                         }
-                if ($('#score-table-body').length && data.scoreTable) {
+                        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>
     
@@ -199,13 +186,16 @@ function pollForUpdates(gameId) {
                                     </div>
                                 `;
                             });
-                    $('#score-table-body').html(scoreHTML);
+                            scoreBody.innerHTML = scoreHTML;
                         }
-                const cardId = data.firstCardId;
+                        const firstCardContainer = document.getElementById('first-card-container');
-                if ($('#first-card-container').length) {
+                        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";
@@ -213,162 +203,107 @@ function pollForUpdates(gameId) {
                                 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"/>
                             `;
 
-                    $('#first-card-container').html(newImageHTML);
+                            // Clear the container and insert the new image
+                            firstCardContainer.innerHTML = newImageHTML;
                         }
-            } else if (data.status === "reloadEvent") {
+                    } else if (data.status === "gameStart") {
-                console.log("[DEBUG] Reload event received. Redirecting...");
+                        window.location.href = data.redirectUrl;
-                exchangeBody(data.content, "Knockout Whist - Ingame", data.redirectUrl);
                     }
-            else if (data.status === "lobbyUpdate") {
+                    pollForUpdates(gameId);
-                console.log("[DEBUG] Entering 'lobbyUpdate' logic.");
+                });
-                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 => {
+                // Handle network or server errors
-
+                console.error(`Polling error: Status ${response.status}`);
-                        const inner = user.self ? `<h5 class="card-title">${user.name} (You)</h5>` : `    <h5 class="card-title">${user.name}</h5>`
+                // Wait before retrying, passing gameId correctly
-
+                setTimeout(() => pollForUpdates(gameId), 5000);
-                        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").html(newHtml);
-                $('#playerAmount').text(`Playeramount: ${data.users.length} / ${data.maxPlayers}`);
-            } else {
-                console.warn(`[DEBUG] Received unknown status: ${data.status}`);
-            }
-        }),
-        error: ((jqXHR, textStatus, errorThrown) => {
-            if (jqXHR.status >= 400) {
-                console.error(`Server error: ${jqXHR.status}, ${errorThrown}`);
-            }
-            else {
-                console.error(`Something unexpected happened while polling. ${jqXHR.status}, ${errorThrown}`)
-            }
-        }),
-        complete: (() => {
-            setTimeout(() => { polling = false; pollForUpdates(gameId) }, 200);
-        })
         })
+        .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);
 }
 
-function backToLobby(gameId) {
-    const route = jsRoutes.controllers.IngameController.returnToLobby(gameId);
-
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData && errorData.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
-        })
-    })
-
-}
-
 function 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 => {
-            if (data.status === 'success') {
-                exchangeBody(data.content, "Knockout Whist - Lobby", data.redirectUrl);
-            }
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData && errorData.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
     })
-    })
+        .then(response => {
-}
+            return response.json().then(data => {
-
+                if (!response.ok) {
-function exchangeBody(content, title = "Knockout Whist", url = null) {
+                    return Promise.reject(data);
-    if (url) {
-        window.history.pushState({}, title, url);
                 }
-    $("#main-body").html(content);
+                return data;
-    document.title = title;
+            });
-}
+        })
-
+        .then(data => {
-function startGame(gameId) {
-    sendGameStartRequest(gameId)
-}
-
-function sendGameStartRequest(gameId) {
-    const route = jsRoutes.controllers.IngameController.startGame(gameId);
-
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        dataType: 'json',
-        success: (data => {
             if (data.status === 'success') {
                 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)
@@ -377,211 +312,75 @@ function removePlayer(gameid, playersessionId) {
 function sendRemovePlayerRequest(gameId, playersessionId) {
     const route = jsRoutes.controllers.IngameController.kickPlayer(gameId, playersessionId);
 
-    $.ajax({
+    fetch(route.url, {
-        url: route.url,
+        method: route.type,
-        type: route.type,
+        headers: {
-        contentType: 'application/json',
+            'Content-Type': 'application/json',
-        dataType: 'json',
+        }
-        success: (data => {
+    })
+        .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;
             }
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData && errorData.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
         })
-    })
+        .catch(error => {
-}
+            if (error && error.errorMessage) {
-
-function login() {
-    const username = $('#username').val();
-    const password = $('#password').val();
-
-    const jsonObj = {
-        username: username,
-        password: password
-    };
-
-    const route = jsRoutes.controllers.UserController.login_Post();
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        success: (data => {
-            if (data.status === 'success') {
-                exchangeBody(data.content, 'Knockout Whist - Create Game', data.redirectUrl);
-                return
-            }
-            alert('Login failed. Please check your credentials and try again.');
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData && errorData.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
-        })
-    });
-}
-
-function joinGame() {
-    const gameId = $('#gameId').val();
-
-    const jsonObj = {
-        gameId: gameId
-    };
-
-    const route = jsRoutes.controllers.MainMenuController.joinGame();
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        success: (data => {
-            if (data.status === 'success') {
-                exchangeBody(data.content, "Knockout Whist - Lobby", data.redirectUrl);
-                return
-            }
-            alert('Could not join the game. Please check the Game ID and try again.');
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData && 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 && errorData.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
-        })
-    });
-    return false
-}
-
-
-function selectTie(gameId) {
-    const route = jsRoutes.controllers.IngameController.playTie(gameId);
-    const jsonObj = {
-        tie: $('#tieNumber').val()
-    };
-
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        error: (jqXHR => {
-            let error;
-            try {
-                error = JSON.parse(jqXHR.responseText);
-            } catch (e) {
-                console.error("Failed to parse error response:", e);
-            }
-            if (error?.errorMessage) {
                 alert(`${error.errorMessage}`);
             } else {
                 alert('An unexpected error occurred. Please try again.');
             }
-        })
+        });
-    })
 }
-
 function leaveGame(gameId) {
     sendLeavePlayerRequest(gameId)
 }
-
 function sendLeavePlayerRequest(gameId) {
+
     const route = jsRoutes.controllers.IngameController.leaveGame(gameId);
-    $.ajax({
+    fetch(route.url, {
-        url: route.url,
+        method: route.type,
-        type: route.type,
+    })
-        dataType: 'json',
+        .then(response => {
-        error: ((jqXHR) => {
+            return response.json().then(data => {
-            const errorData = JSON.parse(jqXHR.responseText);
+                if (!response.ok) {
-            if (errorData && errorData.errorMessage) {
+                    return Promise.reject(data);
-                alert(`${errorData.errorMessage}`);
+                }
-            } else {
+                return data;
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
+            });
+        })
+        .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) {
-
-function handleTrumpSelection(cardobject, gameId) {
-    const trumpId = cardobject.dataset.trump;
-    const jsonObj = {
-        trump: trumpId
-    }
-
-    const route = jsRoutes.controllers.IngameController.playTrump(gameId);
-
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        error: (jqXHR => {
-            let error;
-            try {
-                error = JSON.parse(jqXHR.responseText);
-            } catch (e) {
-                console.error("Failed to parse error response:", e);
-            }
-            if (error?.errorMessage) {
                 alert(`${error.errorMessage}`);
             } else {
                 alert('An unexpected error occurred. Please try again.');
             }
-        })
+        });
-    })
 }
 
-function handlePlayCard(cardobject, gameId, dog = false) {
+function handlePlayCard(cardobject, gameId) {
     const cardId = cardobject.dataset.cardId;
     const jsonObj = {
         cardID: cardId
     }
-    sendPlayCardRequest(jsonObj, gameId, cardobject, dog)
+    sendPlayCardRequest(jsonObj, gameId, cardobject)
 }
 
-function handleSkipDogLife(cardobject, gameId) {
+function sendPlayCardRequest(jsonObj, gameId, cardobject) {
-
     const wiggleKeyframes = [
         { transform: 'translateX(0)' },
         { transform: 'translateX(-5px)' },
@@ -590,78 +389,44 @@ function handleSkipDogLife(cardobject, gameId) {
         { transform: 'translateX(0)' }
     ];
 
+    // Define the timing options
     const wiggleTiming = {
-        duration: 400,
+        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.IngameController.playDogCard(gameId);
+    fetch(route.url, {
-
+        method: route.type,
-    $.ajax({
+        headers: {
-        url: route.url,
+            'Content-Type': 'application/json',
-        type: route.type,
+        },
-        contentType: 'application/json',
+        body: JSON.stringify(jsonObj)
-        dataType: 'json',
+    })
-        data: JSON.stringify({
+        .then(response => {
-            cardID: 'skip'
+            return response.json().then(data => {
-        }),
+                if (!response.ok) {
-        error: (jqXHR => {
+                    return Promise.reject(data);
-            let error;
-            try {
-                error = JSON.parse(jqXHR.responseText);
-            } catch (e) {
-                console.error("Failed to parse error response:", e);
                 }
-            if (error?.errorMessage.includes("You can't skip this round!")) {
+                return data;
+            });
+        })
+        .then(data => {
+            if (data.status === 'success') {
+                //window.location.href = data.redirectUrl;
+            }
+        })
+        .catch(error => {
+            if (error && error.errorMessage.includes("You can't play this card!")) {
                 cardobject.parentElement.animate(wiggleKeyframes, wiggleTiming);
-            } else if (error?.errorMessage) {
+            } else if (error && error.errorMessage) {
                 alert(`${error.errorMessage}`);
             } else {
                 alert('An unexpected error occurred. Please try again.');
             }
-        })
+        });
-    })
-}
-
-function sendPlayCardRequest(jsonObj, gameId, cardobject, dog) {
-    const wiggleKeyframes = [
-        { transform: 'translateX(0)' },
-        { transform: 'translateX(-5px)' },
-        { transform: 'translateX(5px)' },
-        { transform: 'translateX(-5px)' },
-        { transform: 'translateX(0)' }
-    ];
-
-    const wiggleTiming = {
-        duration: 400,
-        iterations: 1,
-        easing: 'ease-in-out',
-        fill: 'forwards'
-    };
-    const route = dog === "true" ? jsRoutes.controllers.IngameController.playDogCard(gameId) : jsRoutes.controllers.IngameController.playCard(gameId);
-
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        error: (jqXHR => {
-            try {
-                error = JSON.parse(jqXHR.responseText);
-            } catch (e) {
-                console.error("Failed to parse error response:", e);
-            }
-            if (error?.errorMessage.includes("You can't play this card!")) {
-                cardobject.parentElement.animate(wiggleKeyframes, wiggleTiming);
-            } else if (error?.errorMessage) {
-                alert(`${error.errorMessage}`);
-            } else {
-                alert('An unexpected error occurred. Please try again.');
-            }
-        })
-    })
 }
 

versions.env

@@ -1,3 +1,3 @@
-MAJOR=3
+MAJOR=1
 MINOR=0
-PATCH=1
+PATCH=9