diff --git a/knockoutwhistweb/app/assets/stylesheets/main.less b/knockoutwhistweb/app/assets/stylesheets/main.less index b321c74..83f8431 100644 --- a/knockoutwhistweb/app/assets/stylesheets/main.less +++ b/knockoutwhistweb/app/assets/stylesheets/main.less @@ -219,10 +219,10 @@ body { } -#nextPlayers { +#next-players-container { display: flex; flex-direction: column; - align-items: center; + align-items: flex-start; height: 0; p { @@ -231,10 +231,6 @@ body { } } -#invisible { - visibility: hidden; -} - #selecttrumpsuit { display: flex; flex-direction: column; diff --git a/knockoutwhistweb/app/model/sessions/UserSession.scala b/knockoutwhistweb/app/model/sessions/UserSession.scala index 1547826..c8a09bd 100644 --- a/knockoutwhistweb/app/model/sessions/UserSession.scala +++ b/knockoutwhistweb/app/model/sessions/UserSession.scala @@ -41,12 +41,12 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e lock.lock() val result = Try { eventType match { - case "Ping" => + case "ping" => // No action needed for Ping () - case "Start Game" => + case "StartGame" => gameLobby.startGame(user) - case "play Card" => + case "PlayCard" => val maybeCardIndex: Option[Int] = (data \ "cardindex").asOpt[Int] maybeCardIndex match { case Some(index) => @@ -55,7 +55,7 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e case None => println("Card Index not found or is not a number.") } - case "Picked Trumpsuit" => + case "PickTrumpsuit" => val maybeSuitIndex: Option[Int] = (data \ "suitIndex").asOpt[Int] maybeSuitIndex match { case Some(index) => @@ -69,6 +69,7 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e lock.unlock() if (result.isFailure) { val throwable = result.failed.get + throwable.printStackTrace() throw throwable } } diff --git a/knockoutwhistweb/public/javascripts/events.js b/knockoutwhistweb/public/javascripts/events.js index 19a0658..dbb07c4 100644 --- a/knockoutwhistweb/public/javascripts/events.js +++ b/knockoutwhistweb/public/javascripts/events.js @@ -293,6 +293,7 @@ function receiveTurnEvent(eventData) { nextPlayerText.hide(); nextPlayersContainer.html(''); } else { + console.log("Length"+nextPlayers.length); nextPlayerText.show(); let nextPlayersHtml = ''; nextPlayers.forEach((player) => { @@ -300,7 +301,7 @@ function receiveTurnEvent(eventData) { if (player.dog) { playerName += " 🐶"; } - nextPlayersHtml += `

${playerName}

`; + nextPlayersHtml += `

${playerName}

`; }); nextPlayersContainer.html(nextPlayersHtml); } diff --git a/knockoutwhistweb/public/javascripts/interact.js b/knockoutwhistweb/public/javascripts/interact.js index 84ec6aa..e2052fc 100644 --- a/knockoutwhistweb/public/javascripts/interact.js +++ b/knockoutwhistweb/public/javascripts/interact.js @@ -6,7 +6,7 @@ function handlePlayCard(cardIndex, dog) { cardindex: cardIndex, isDog: dog } - sendEventAndWait("play Card", payload).then( + sendEventAndWait("PlayCard", payload).then( () => { console.debug("play card successful") const datacardid = $(`#${cardIndex}`) @@ -40,7 +40,7 @@ function handleSkipDogLife(button) { // TODO needs implementation } function startGame() { - sendEvent("Start Game") + sendEvent("StartGame") } function handleTrumpSelection(object) { @@ -49,8 +49,7 @@ function handleTrumpSelection(object) { const payload = { suitIndex: trumpIndex } - console.log("SENDING TRUMP SUIT SELECTION:", payload); - sendEvent("Picked Trumpsuit", payload) + sendEvent("PickTrumpsuit", payload) } function handleKickPlayer(playerId) {