feat: Add database configuration and update routing for game creation
This commit is contained in:
@@ -8,9 +8,6 @@ import play.twirl.api.Html
|
||||
import scalafx.scene.image.Image
|
||||
|
||||
object WebUIUtils {
|
||||
def cardtoImage(card: Card): Html = {
|
||||
views.html.render.card.apply(cardToPath(card))(card.toString)
|
||||
}
|
||||
|
||||
def cardToPath(card: Card): String = {
|
||||
f"images/cards/${cardtoString(card)}.png"
|
||||
|
||||
@@ -36,16 +36,12 @@ object WebsocketEventMapper {
|
||||
|
||||
// Register all custom mappers here
|
||||
registerCustomMapper(ReceivedHandEventMapper)
|
||||
//registerCustomMapper(GameStateEventMapper)
|
||||
registerCustomMapper(CardPlayedEventMapper)
|
||||
registerCustomMapper(NewRoundEventMapper)
|
||||
registerCustomMapper(NewTrickEventMapper)
|
||||
registerCustomMapper(TrickEndEventMapper)
|
||||
registerCustomMapper(RequestCardEventMapper)
|
||||
registerCustomMapper(LobbyUpdateEventMapper)
|
||||
registerCustomMapper(LeftEventMapper)
|
||||
registerCustomMapper(KickEventMapper)
|
||||
registerCustomMapper(SessionClosedMapper)
|
||||
registerCustomMapper(TurnEventMapper)
|
||||
|
||||
def toJson(obj: SimpleEvent, session: UserSession): JsValue = {
|
||||
@@ -54,7 +50,6 @@ object WebsocketEventMapper {
|
||||
}else {
|
||||
None
|
||||
}
|
||||
//println(s"This is getting sent to client: EVENT: ${obj.id}, STATE: ${session.gameLobby.getLogic.getCurrentState.toString}, STATEDATA: ${stateToJson(session)}, DATA: ${data}")
|
||||
Json.obj(
|
||||
"id" -> ("request-" + java.util.UUID.randomUUID().toString),
|
||||
"event" -> obj.id,
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
package util.mapper
|
||||
|
||||
import controllers.IngameController
|
||||
import de.knockoutwhist.events.global.GameStateChangeEvent
|
||||
import model.sessions.UserSession
|
||||
import play.api.libs.json.{JsObject, Json}
|
||||
import util.GameUtil
|
||||
|
||||
object GameStateEventMapper extends SimpleEventMapper[GameStateChangeEvent] {
|
||||
|
||||
override def id: String = "GameStateChangeEvent"
|
||||
|
||||
override def toJson(event: GameStateChangeEvent, session: UserSession): JsObject = {
|
||||
Json.obj(
|
||||
"title" -> ("Knockout Whist - " + GameUtil.stateToTitle(event.newState)),
|
||||
"content" -> IngameController.returnInnerHTML(session.gameLobby, event.newState, session.user).toString
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package util.mapper
|
||||
|
||||
import controllers.routes
|
||||
import events.KickEvent
|
||||
import model.sessions.UserSession
|
||||
import play.api.libs.json.{JsObject, Json}
|
||||
|
||||
object KickEventMapper extends SimpleEventMapper[KickEvent] {
|
||||
|
||||
override def id: String = "KickEvent"
|
||||
|
||||
override def toJson(event: KickEvent, session: UserSession): JsObject = {
|
||||
Json.obj(
|
||||
"url" -> routes.MainMenuController.mainMenu().url,
|
||||
"content" -> views.html.mainmenu.creategame(Some(session.user)).toString,
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package util.mapper
|
||||
|
||||
import controllers.routes
|
||||
import events.{KickEvent, LeftEvent}
|
||||
import model.sessions.UserSession
|
||||
import play.api.libs.json.{JsObject, Json}
|
||||
|
||||
object LeftEventMapper extends SimpleEventMapper[LeftEvent] {
|
||||
|
||||
override def id: String = "LeftEvent"
|
||||
|
||||
override def toJson(event: LeftEvent, session: UserSession): JsObject = {
|
||||
Json.obj(
|
||||
"url" -> routes.MainMenuController.mainMenu().url,
|
||||
"content" -> views.html.mainmenu.creategame(Some(session.user)).toString
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package util.mapper
|
||||
|
||||
import controllers.routes
|
||||
import de.knockoutwhist.events.global.SessionClosed
|
||||
import model.sessions.UserSession
|
||||
import play.api.libs.json.{JsObject, Json}
|
||||
|
||||
object SessionClosedMapper extends SimpleEventMapper[SessionClosed] {
|
||||
|
||||
override def id: String = "SessionClosed"
|
||||
|
||||
override def toJson(event: SessionClosed, session: UserSession): JsObject = {
|
||||
Json.obj(
|
||||
"url" -> routes.MainMenuController.mainMenu().url,
|
||||
"content" -> views.html.mainmenu.creategame(Some(session.user)).toString,
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user