diff --git a/knockoutwhistweb/app/assets/stylesheets/dark-mode.less b/knockoutwhistweb/app/assets/stylesheets/dark-mode.less index 17b7f1a..02d2efa 100644 --- a/knockoutwhistweb/app/assets/stylesheets/dark-mode.less +++ b/knockoutwhistweb/app/assets/stylesheets/dark-mode.less @@ -1,7 +1,8 @@ @media (prefers-color-scheme: dark) { :root { - --background-image: url('/assets/images/background.png'); - --color: #f8f9fa; /* Light text on dark bg */ + --background-image: url('/assets/images/background.png') !important; + --color: #f8f9fa !important; /* Light text on dark bg */ + --highlightscolor: rgba(131, 131, 131, 0.75) !important; /* Bootstrap variable overrides for dark mode */ --bs-body-color: var(--color); diff --git a/knockoutwhistweb/app/assets/stylesheets/light-mode.less b/knockoutwhistweb/app/assets/stylesheets/light-mode.less index 27c5be4..5975dcc 100644 --- a/knockoutwhistweb/app/assets/stylesheets/light-mode.less +++ b/knockoutwhistweb/app/assets/stylesheets/light-mode.less @@ -1,4 +1,5 @@ :root { --background-image: url('/assets/images/img.png'); --color: black; + --highlightscolor: rgba(0, 0, 0, 0.75); } diff --git a/knockoutwhistweb/app/assets/stylesheets/main.less b/knockoutwhistweb/app/assets/stylesheets/main.less index b723d4c..d41bf29 100644 --- a/knockoutwhistweb/app/assets/stylesheets/main.less +++ b/knockoutwhistweb/app/assets/stylesheets/main.less @@ -15,6 +15,7 @@ --bs-heading-color: var(--color) !important; } +@highlightcolor: var(--highlightscolor); @background-image: var(--background-image); @color: var(--color); @keyframes slideIn { @@ -37,6 +38,18 @@ float: none; margin-right:0; } +.handcard :hover { + box-shadow: 3px 3px 3px @highlightcolor; +} + +.bottom-div { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + text-align: center; + padding: 10px; +} /* Ensure body text color follows theme variable and works with Bootstrap */ body { diff --git a/knockoutwhistweb/app/logic/user/impl/BaseSessionManager.scala b/knockoutwhistweb/app/logic/user/impl/BaseSessionManager.scala index 1efe06c..61e670d 100644 --- a/knockoutwhistweb/app/logic/user/impl/BaseSessionManager.scala +++ b/knockoutwhistweb/app/logic/user/impl/BaseSessionManager.scala @@ -13,6 +13,7 @@ import java.time.Instant import java.time.temporal.ChronoUnit import java.util.concurrent.TimeUnit import javax.inject.{Inject, Singleton} +import scala.util.Try @Singleton class BaseSessionManager @Inject()(val keyProvider: JwtKeyProvider, val userManager: StubUserManager, val config: Config) extends SessionManager { @@ -44,15 +45,21 @@ class BaseSessionManager @Inject()(val keyProvider: JwtKeyProvider, val userMana } override def getUserBySession(sessionId: String): Option[User] = { - //TODO verify JWT token instead of looking up in cache val cachedUser = cache.getIfPresent(sessionId) if (cachedUser != null) { Some(cachedUser) } else { - val decoded = verifier.verify(sessionId) - val user = userManager.userExistsById(decoded.getClaim("id").asLong()) - user.foreach(u => cache.put(sessionId, u)) - user + val result = Try { + val decoded = verifier.verify(sessionId) + val user = userManager.userExistsById(decoded.getClaim("id").asLong()) + user.foreach(u => cache.put(sessionId, u)) + user + } + if (result.isSuccess) { + result.get + } else { + None + } } } diff --git a/knockoutwhistweb/app/views/ingame/ingame.scala.html b/knockoutwhistweb/app/views/ingame/ingame.scala.html index 4dc9f97..db56c27 100644 --- a/knockoutwhistweb/app/views/ingame/ingame.scala.html +++ b/knockoutwhistweb/app/views/ingame/ingame.scala.html @@ -3,11 +3,10 @@ @(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby) @main("Ingame") { -
+
- -
-
+
+

Current Player

@gamelobby.getLogic.getCurrentPlayer.get.name

@if(!TrickUtil.isOver(gamelobby.getLogic.getCurrentMatch.get, gamelobby.getLogic.getPlayerQueue.get)) { @@ -18,9 +17,19 @@ }
- -
- +
+ @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) { +
+
+
+ @util.WebUIUtils.cardtoImage(cardplayed) width="100%"/> +
+
+ @player +
+
+
+ }
@@ -38,34 +47,24 @@
- -
- @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) { -
-
-
- @util.WebUIUtils.cardtoImage(cardplayed) width="100%"/> -
-
- @player -
-
-
- } + +
+
- -
- @for(i <- player.currentHand().get.cards.indices) { -
-
- - -
-
- } +
+
+ @for(i <- player.currentHand().get.cards.indices) { +
+
+ + +
+
+ } +
} diff --git a/knockoutwhistweb/app/views/lobby/lobby.scala.html b/knockoutwhistweb/app/views/lobby/lobby.scala.html index 090b1a7..074e250 100644 --- a/knockoutwhistweb/app/views/lobby/lobby.scala.html +++ b/knockoutwhistweb/app/views/lobby/lobby.scala.html @@ -29,11 +29,11 @@
@if(playersession.id == user.get.id) {
@playersession.name (You)
-

Your text could be here!

+@*

Your text could be here!

*@ Remove } else {
@playersession.name
-

Your text could be here!

+@*

Your text could be here!

*@
diff --git a/knockoutwhistweb/app/views/mainmenu/navbar.scala.html b/knockoutwhistweb/app/views/mainmenu/navbar.scala.html index 3008b6d..5d21070 100644 --- a/knockoutwhistweb/app/views/mainmenu/navbar.scala.html +++ b/knockoutwhistweb/app/views/mainmenu/navbar.scala.html @@ -1,11 +1,14 @@ @(user: Option[model.users.User])