Added link to click for player pov, started rendering with images

knockoutwhistweb/app/components/WebApplicationConfiguration.scala

@@ -1,7 +1,7 @@
 package components
 
-import controllers.WebUI
 import de.knockoutwhist.components.DefaultConfiguration
+import controllers.WebUI
 import de.knockoutwhist.ui.UI
 import de.knockoutwhist.utils.events.EventListener
 

knockoutwhistweb/app/controllers/sessions/SimpleSession.scala

@@ -10,6 +10,8 @@ import de.knockoutwhist.events.cards.{RenderHandEvent, ShowTieCardsEvent}
 import de.knockoutwhist.events.round.ShowCurrentTrickEvent
 import de.knockoutwhist.player.AbstractPlayer
 import de.knockoutwhist.utils.events.SimpleEvent
+import scalafx.scene.image.Image
+import util.WebUIUtils
 
 import java.util.UUID
 
@@ -17,6 +19,7 @@ case class SimpleSession(id: UUID, private var output: String) extends PlayerSes
   def get(): String = {
     output
   }
+
   override def updatePlayer(event: SimpleEvent): Unit = {
     event match {
       case event: RenderHandEvent =>
@@ -41,7 +44,7 @@ case class SimpleSession(id: UUID, private var output: String) extends PlayerSes
   }
 
   private def renderHand(event: RenderHandEvent): Unit = {
-    WebUICards.renderHandEvent(event.hand, event.showNumbers).foreach(addToOutput)
+    output += WebUICards.renderHandEvent(event.hand, event.showNumbers).map(_.toString).mkString
   }
 
   private def showtiecardseventmethod(event: ShowTieCardsEvent): Option[Boolean] = {
@@ -49,14 +52,14 @@ case class SimpleSession(id: UUID, private var output: String) extends PlayerSes
     for ((player, card) <- event.card) {
       val playerNameLength = player.name.length
       a(0) += " " + player.name + ":" + (" " * (playerNameLength - 1))
-      val rendered = WebUICards.renderCardAsString(card)
+      val rendered = WebUIUtils.cardtoImage(card)
-      a(1) += " " + rendered(0)
+      //a(1) += " " + rendered(0)
-      a(2) += " " + rendered(1)
+      //a(2) += " " + rendered(1)
-      a(3) += " " + rendered(2)
+      //a(3) += " " + rendered(2)
-      a(4) += " " + rendered(3)
+      //a(4) += " " + rendered(3)
-      a(5) += " " + rendered(4)
+      //a(5) += " " + rendered(4)
-      a(6) += " " + rendered(5)
+      //a(6) += " " + rendered(5)
-      a(7) += " " + rendered(6)
+      //a(7) += " " + rendered(6)
     }
     a.foreach(addToOutput)
     Some(true)
@@ -253,16 +256,16 @@ case class SimpleSession(id: UUID, private var output: String) extends PlayerSes
       )
     }
 
-    def renderHandEvent(hand: Hand, showNumbers: Boolean): Vector[String] = {
+    def renderHandEvent(hand: Hand, showNumbers: Boolean): List[Image] = {
-      val cardStrings = hand.cards.map(renderCardAsString)
+      hand.cards.map(WebUIUtils.cardtoImage)
-      var zipped = cardStrings.transpose
+      //var zipped = cardStrings.transpose
-      if (showNumbers) zipped = {
+      //if (showNumbers) zipped = {
-        List.tabulate(hand.cards.length) { i =>
+      // List.tabulate(hand.cards.length) { i =>
-          s"     ${i + 1}     "
+      //    s"     ${i + 1}     "
-        }
+      //  }
-      } :: zipped
+      // } :: zipped
-      zipped.map(_.mkString(" ")).toVector
+      // zipped.map(_.mkString(" ")).toVector
+      // }
     }
   }
-
 }

knockoutwhistweb/app/util/WebUIUtils.scala

@@ -0,0 +1,33 @@
+package util
+
+import de.knockoutwhist.cards.Card
+import de.knockoutwhist.cards.CardValue.{Ace, Eight, Five, Four, Jack, King, Nine, Queen, Seven, Six, Ten, Three, Two}
+import de.knockoutwhist.cards.Suit.{Clubs, Diamonds, Hearts, Spades}
+import scalafx.scene.image.Image
+
+object WebUIUtils {
+  def cardtoImage(card: Card): Image = {
+    val s = card.suit match {
+      case Spades => "S"
+      case Hearts => "H"
+      case Clubs => "C"
+      case Diamonds => "D"
+    }
+    val cv = card.cardValue match {
+      case Ace => "A"
+      case King => "K"
+      case Queen => "Q"
+      case Jack => "J"
+      case Ten => "T"
+      case Nine => "9"
+      case Eight => "8"
+      case Seven => "7"
+      case Six => "6"
+      case Five => "5"
+      case Four => "4"
+      case Three => "3"
+      case Two => "2"
+    }
+    new Image(f"public/images/cards/$cv$s.png")
+  }
+}

knockoutwhistweb/app/views/tui.scala.html

@@ -3,7 +3,7 @@
 @main("Tui") {
     <div id="tui">
         @for(line <- toRender.split('\n')) {
-            <p>@line</p>
+            <a href="@routes.Relative.ingame(line)">@line</a>
         }
     </div>
 }