KnockOutWhist/KnockOutWhist-Web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

feat(ui): add main menu navbar and join game functionality (#35)

Browse Source 
Reviewed-on: #35
Reviewed-by: lq64 <lq@blackhole.local>
Co-authored-by: Janis <janis.e.20@gmx.de>
Co-committed-by: Janis <janis.e.20@gmx.de>
This commit is contained in:
Janis
2025-11-04 12:43:08 +01:00
committed by lq64
parent 5c1a5a661b
commit 32d4f9c6ce
13 changed files with 111 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
knockoutwhistweb/app/controllers/IngameController.scala
View File

@@ -111,7 +111,10 @@ class IngameController @Inject()(
cardIdOpt match {
case Some(cardId) =>
val result = Try {
g.playCard(g.getUserSession(request.user.id), cardId.toInt)
val session = g.getUserSession(request.user.id)
session.lock.lock()
g.playCard(session, cardId.toInt)
session.lock.unlock()
}
if (result.isSuccess) {
NoContent
@@ -146,9 +149,15 @@ class IngameController @Inject()(
val result = Try {
cardIdOpt match {
case Some(cardId) if cardId == "skip" =>
g.playDogCard(g.getUserSession(request.user.id), -1)
val session = g.getUserSession(request.user.id)
session.lock.lock()
g.playDogCard(session, -1)
session.lock.unlock()
case Some(cardId) =>
g.playDogCard(g.getUserSession(request.user.id), cardId.toInt)
val session = g.getUserSession(request.user.id)
session.lock.lock()
g.playDogCard(session, cardId.toInt)
session.lock.unlock()
case None =>
throw new IllegalArgumentException("cardId parameter is missing")
}
@@ -184,7 +193,10 @@ class IngameController @Inject()(
trumpOpt match {
case Some(trump) =>
val result = Try {
g.selectTrump(g.getUserSession(request.user.id), trump.toInt)
val session = g.getUserSession(request.user.id)
session.lock.lock()
g.selectTrump(session, trump.toInt)
session.lock.unlock()
}
if (result.isSuccess) {
NoContent
@@ -216,7 +228,10 @@ class IngameController @Inject()(
tieOpt match {
case Some(tie) =>
val result = Try {
val session = g.getUserSession(request.user.id)
session.lock.lock()
g.selectTie(g.getUserSession(request.user.id), tie.toInt)
session.lock.unlock()
}
if (result.isSuccess) {
NoContent