feat(ui): added working ingame ui

Added ingame ui with bootstrap. There were problems with the lock procedure
feat(ui): add Lobby and Main Menu Body
2025-11-05 11:39:50 +01:00 · 2025-11-05 11:38:32 +01:00 · 2025-11-05 11:36:08 +01:00 · 2025-11-05 11:32:26 +01:00
93 changed files with 2389 additions and 5688 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +0,0 @@
-.env
--- a/.gitignore
+++ b/.gitignore
@@ -134,9 +134,7 @@ target
 /.project
 /.settings
 /RUNNING_PID
-/knockoutwhistwebfrontend/
 /knockoutwhist/
 /knockoutwhistweb/.g8/
 /knockoutwhistweb/.bsp/
 /currentSnapshot.json
-.env
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,8 +2,3 @@
 	path = knockoutwhist
 	branch = main
 	url = https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist.git
-
-[submodule "knockoutwhistfrontend"]
-	path = knockoutwhistfrontend
-	branch = main
-	url = https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend.git
--- a/.sbtopts
+++ b/.sbtopts
@@ -1,2 +0,0 @@
-J--add-opens=java.base/java.util=ALL-UNNAMED
-J--add-opens=java.base/java.lang=ALL-UNNAMED
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-##  (2025-11-07)
+##  (2025-11-03)

 ### ⚠ BREAKING CHANGES

@@ -7,10 +7,7 @@
 ### Features

 * **config:** add issue templates for Epics, User Stories, and Subtasks ([#4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/4)) ([d71809d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/d71809d6f4389b03ecc8ee9b857e58a4da413fa2))
-* **docker:** added docker container support ([#47](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/47)) ([4d6ea54](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4d6ea54771c284d5ea0bb798fedaf0423a6cdd58))
 * implemented multigame support ([#34](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/34)) ([afde6c0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/afde6c02da2c3055084ae90ab6b11b63b0e11cfb))
-* **ui:** add Lobby and Main Menu Body ([#38](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/38)) ([051e740](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/051e7406e30385d3260631a783f507b90d9f94d1))
-* **ui:** add main menu navbar and join game functionality ([#35](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/35)) ([32d4f9c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/32d4f9c6cefa20f10816dad9f33548a146d4c2c3))
 * **ui:** added rules ([#12](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/12)) ([92e4851](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/92e4851219e64ad919d7f8bc7c30232ef7d6570f))
 * **ui:** CSS Animations [#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/18) ([#27](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/27)) ([c0dadf8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c0dadf89274169b396089c2e7b3d69b043097186))
 * **ui:** implement CSS variables for theme support ([#26](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/26)) ([1f377de](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1f377de0f43aaf17271d29678a1accf11cfe121c)), closes [#17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/17)
@@ -21,22 +18,17 @@

 * **base:** fixed persistence logic ([#21](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/21)) ([7f765b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7f765b4514459202df3768c64a1df383fecb66e2))
 * **config:** modified git module to use the main branch ([#10](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/10)) ([ccf44ed](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/ccf44ede41e10df4b973c9cecc09d1e7105143f5))
-* disabled external node ([51d9c0b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/51d9c0b5f687d951f42480e333f37b3155d58dbd))
-* ensure proper unlocking of user session locks in game actions ([#37](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/37)) ([44c88c8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/44c88c8f60abf4a54e721f8e7f6de44a6d28b258))
 * **imports:** reorganized import statements for clarity and consistency ([#22](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/22)) ([1517d0c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1517d0c006247a95b02f66fa5bc53cc78b9d89fa))
-* improve lock handling in user session interactions ([#36](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/36)) ([96c3846](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/96c38466d20203a561a5bc3bba560c9d9fd6d754))
 * **ui:** add light mode styles, update font families and fixed ui ([#24](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/24)) ([729a4ee](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/729a4eec6b721f8118d0feffa44721262ccd595f))
 * **ui:** added dark mode ([#25](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/25)) ([6c31fa0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/6c31fa0538e5d71c8be9a728eebf7576cb108782))
 * **ui:** changed backgrounds ([#33](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/33)) ([bef96ba](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bef96ba7e39a633c1972b01b1c1ebab9d1d3ee1c))
-* update allowed hosts filter and adjust background color in login page ([#45](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/45)) ([aa83082](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/aa83082d095b30fd3eae336ad5f1aa5d409fbdab))
-* update file paths and improve session handling in user interactions ([#39](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/39)) ([de565b5](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/de565b52dca6b49b903eceaecd47cc3a5429608b))

 ### Reverts

 * ci: bump version to v1.0.0 [skip ci] ([91d7f6c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/91d7f6ca003edb368aba76b7a82c8b42d22bdbfe))
 * version bumb ([2e10059](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2e10059a6756befe6f8e70c94fd34b865693efb8))
 * version bump ([7879d1a](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7879d1ab6ee8f227c19b69b467a28dd7b479ff73))
-##  (2025-11-07)
+##  (2025-11-03)

 ### ⚠ BREAKING CHANGES

@@ -45,10 +37,7 @@
 ### Features

 * **config:** add issue templates for Epics, User Stories, and Subtasks ([#4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/4)) ([d71809d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/d71809d6f4389b03ecc8ee9b857e58a4da413fa2))
-* **docker:** added docker container support ([#47](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/47)) ([4d6ea54](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4d6ea54771c284d5ea0bb798fedaf0423a6cdd58))
 * implemented multigame support ([#34](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/34)) ([afde6c0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/afde6c02da2c3055084ae90ab6b11b63b0e11cfb))
-* **ui:** add Lobby and Main Menu Body ([#38](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/38)) ([051e740](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/051e7406e30385d3260631a783f507b90d9f94d1))
-* **ui:** add main menu navbar and join game functionality ([#35](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/35)) ([32d4f9c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/32d4f9c6cefa20f10816dad9f33548a146d4c2c3))
 * **ui:** added rules ([#12](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/12)) ([92e4851](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/92e4851219e64ad919d7f8bc7c30232ef7d6570f))
 * **ui:** CSS Animations [#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/18) ([#27](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/27)) ([c0dadf8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c0dadf89274169b396089c2e7b3d69b043097186))
 * **ui:** implement CSS variables for theme support ([#26](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/26)) ([1f377de](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1f377de0f43aaf17271d29678a1accf11cfe121c)), closes [#17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/17)
@@ -59,220 +48,94 @@

 * **base:** fixed persistence logic ([#21](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/21)) ([7f765b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7f765b4514459202df3768c64a1df383fecb66e2))
 * **config:** modified git module to use the main branch ([#10](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/10)) ([ccf44ed](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/ccf44ede41e10df4b973c9cecc09d1e7105143f5))
-* disabled external node ([51d9c0b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/51d9c0b5f687d951f42480e333f37b3155d58dbd))
-* ensure proper unlocking of user session locks in game actions ([#37](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/37)) ([44c88c8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/44c88c8f60abf4a54e721f8e7f6de44a6d28b258))
 * **imports:** reorganized import statements for clarity and consistency ([#22](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/22)) ([1517d0c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1517d0c006247a95b02f66fa5bc53cc78b9d89fa))
-* improve lock handling in user session interactions ([#36](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/36)) ([96c3846](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/96c38466d20203a561a5bc3bba560c9d9fd6d754))
 * **ui:** add light mode styles, update font families and fixed ui ([#24](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/24)) ([729a4ee](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/729a4eec6b721f8118d0feffa44721262ccd595f))
 * **ui:** added dark mode ([#25](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/25)) ([6c31fa0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/6c31fa0538e5d71c8be9a728eebf7576cb108782))
 * **ui:** changed backgrounds ([#33](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/33)) ([bef96ba](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bef96ba7e39a633c1972b01b1c1ebab9d1d3ee1c))
-* update allowed hosts filter and adjust background color in login page ([#45](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/45)) ([aa83082](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/aa83082d095b30fd3eae336ad5f1aa5d409fbdab))
-* update file paths and improve session handling in user interactions ([#39](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/39)) ([de565b5](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/de565b52dca6b49b903eceaecd47cc3a5429608b))

 ### Reverts

 * ci: bump version to v1.0.0 [skip ci] ([91d7f6c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/91d7f6ca003edb368aba76b7a82c8b42d22bdbfe))
 * version bumb ([2e10059](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2e10059a6756befe6f8e70c94fd34b865693efb8))
 * version bump ([7879d1a](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7879d1ab6ee8f227c19b69b467a28dd7b479ff73))
-
-##  (2025-11-07)
-
-### Bug Fixes
-
-* ensure proper CMD syntax in Dockerfile ([#48](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/48)) ([5c6d3ac](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/5c6d3ac436f6d23a36f58b6835c9bd50feddc789))
-##  (2025-11-07)
-
-### Bug Fixes
-
-* changelog syntax ([2e54880](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2e548803020c99f62644283fcf3570048261173a))
-##  (2025-11-07)
-
-### Bug Fixes
-
-* removed trailing ([64a7a63](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/64a7a63ab3dff59e66f62328e3b5865bb177fcde))
-##  (2025-11-07)
-
-### Bug Fixes
-
-* traling ([54e3215](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/54e321512777f6722864694eb677eab0e8418a9f))
-##  (2025-11-07)
-
-### Bug Fixes
-
-* removed trailing ([5e503cb](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/5e503cbc364f7cb23926976acc6cee575eadd9d6))
-##  (2025-11-07)
-
-### Bug Fixes
-
-* trailing ([7adc8b8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7adc8b8645390cd18d63b4eee6db8ef448b7a46a))
-##  (2025-11-07)
-
-### Bug Fixes
-
-* removed trailing ([c7dd72e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c7dd72ecc2786ef63daf2b4288093025a8e22bfd))
-* removed trailing ([42a5adb](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/42a5adbae01802587a48a9de15bad44b5ef014cf))
-##  (2025-11-20)
+##  (2025-11-03)

 ### ⚠ BREAKING CHANGES

-* **game:** Fixed polling, SPA, Gameplayloop etc. (#59)
+* implemented multigame support (#34)

 ### Features

-* **ci:** Polling ([370de17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/370de175db65edf87e7ab211190977b540a39d85))
-* **ci:** Polling  Added polling for when the game starts and a card gets played ([#58](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/58)) ([e60fe7c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e60fe7c98dcab05949140a8a54ed6e4e2fbbc022))
-* **game:** Fixed polling, SPA, Gameplayloop etc. ([#59](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/59)) ([a58b2e0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/a58b2e03b11a54667d63ba6604f579a8e328c9d1))
-* **ui:** added js routing, updated ingame ui, added tricktable ([#50](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/50)) ([c220e54](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c220e54bb8d87f4f0f37a089bcd993e8df806123)), closes [#43](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/43) [#43](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/43)
-* **ui:** implement tie & trump menu, fixed some critical bugs ([#52](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/52)) ([5d245d0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/5d245d0011a5fb03193514303b45702cd8329224))
+* **config:** add issue templates for Epics, User Stories, and Subtasks ([#4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/4)) ([d71809d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/d71809d6f4389b03ecc8ee9b857e58a4da413fa2))
+* implemented multigame support ([#34](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/34)) ([afde6c0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/afde6c02da2c3055084ae90ab6b11b63b0e11cfb))
+* **ui:** added rules ([#12](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/12)) ([92e4851](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/92e4851219e64ad919d7f8bc7c30232ef7d6570f))
+* **ui:** CSS Animations [#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/18) ([#27](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/27)) ([c0dadf8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c0dadf89274169b396089c2e7b3d69b043097186))
+* **ui:** implement CSS variables for theme support ([#26](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/26)) ([1f377de](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1f377de0f43aaf17271d29678a1accf11cfe121c)), closes [#17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/17)
+* **ui:** LESS Integration ([72fcf78](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/72fcf783b8ca5ce260e4b152016353e7dc1edb69)), closes [#15-Create-a-default-theme-with-Less-](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/15-Create-a-default-theme-with-Less-) [#23](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/23)
+* **ui:** UI now shows player names instead of their id ([#11](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/11)) ([c168ae7](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c168ae7dc05e99c1890661aa3b63f4d4d12779fb))

 ### Bug Fixes

-* **polling:** Improve polling mechanism and delay handling ([#60](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/60)) ([641c892](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/641c892981649eb85640527cc0fe325ff683fa77))
-##  (2025-11-22)
+* **base:** fixed persistence logic ([#21](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/21)) ([7f765b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7f765b4514459202df3768c64a1df383fecb66e2))
+* **config:** modified git module to use the main branch ([#10](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/10)) ([ccf44ed](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/ccf44ede41e10df4b973c9cecc09d1e7105143f5))
+* **imports:** reorganized import statements for clarity and consistency ([#22](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/22)) ([1517d0c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1517d0c006247a95b02f66fa5bc53cc78b9d89fa))
+* **ui:** add light mode styles, update font families and fixed ui ([#24](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/24)) ([729a4ee](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/729a4eec6b721f8118d0feffa44721262ccd595f))
+* **ui:** added dark mode ([#25](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/25)) ([6c31fa0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/6c31fa0538e5d71c8be9a728eebf7576cb108782))
+* **ui:** changed backgrounds ([#33](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/33)) ([bef96ba](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bef96ba7e39a633c1972b01b1c1ebab9d1d3ee1c))

-### Bug Fixes
+### Reverts

-* **api:** Fixed a bug where the game would reload on game start ([#81](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/81)) ([9738a04](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/9738a04b7a3c63c8cd1450e563ec04823fb3c35a))
-##  (2025-11-23)
+* ci: bump version to v1.0.0 [skip ci] ([91d7f6c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/91d7f6ca003edb368aba76b7a82c8b42d22bdbfe))
+* version bumb ([2e10059](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2e10059a6756befe6f8e70c94fd34b865693efb8))
+##  (2025-11-03)

 ### ⚠ BREAKING CHANGES

-* **websocket:** Implement WebSocket connection and event handling (#82)
+* implemented multigame support (#34)

 ### Features

-* **websocket:** Implement WebSocket connection and event handling ([#82](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/82)) ([8ca909d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/8ca909db522dd7108a3e40ce84811eaf8695eaa5))
-##  (2025-11-24)
-##  (2025-11-26)
-
-### Features
-
-* **api:** Implement received hand event handling and UI updates ([#83](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/83)) ([52e5033](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/52e5033afca344ae40a644196555a9655913710a)), closes [#76](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/76)
-* **base:** Fixed logic for websockets and added GameStateEvent. Might've caused instability on other feature branches! ([#84](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/84)) ([b81bb3d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b81bb3d0aeb8500a9d7417a10e24e7f8a17d71d2))
-##  (2025-11-26)
-
-### Features
-
-* **api:** Implemented card played event via websocket ([#85](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/85)) ([3c0828f](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/3c0828fdbeb507706b86f1662476c46e760533e4))
-##  (2025-11-26)
-
-### Features
-
-* **api:** Implemented session closed and kick event via websocket ([#87](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/87)) ([1ef5e8a](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1ef5e8a72fdf8a3d1ae624c8c3d7c6595017bc6f))
-##  (2025-12-01)
-
-### Features
-
-* **api:** Implemented turn event via websocket ([#86](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/86)) ([2aee79b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2aee79bb6887008397aa0780d1d74ce96af1c202))
-* GameState to Title Mapping BAC-1 ([#92](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/92)) ([6e17328](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/6e17328846745375482c97383b143d86a86e7f32))
-* **ui:** Implement countless feature using the SJWP ([#89](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/89)) ([1f96290](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1f962903712163543fd4f98e696be5e7e29d88a6))
-* **ui:** Popups ([#91](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/91)) ([0037820](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/003782090509bca1c5022c308231b7560dd9b23d))
+* **config:** add issue templates for Epics, User Stories, and Subtasks ([#4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/4)) ([d71809d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/d71809d6f4389b03ecc8ee9b857e58a4da413fa2))
+* implemented multigame support ([#34](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/34)) ([afde6c0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/afde6c02da2c3055084ae90ab6b11b63b0e11cfb))
+* **ui:** added rules ([#12](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/12)) ([92e4851](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/92e4851219e64ad919d7f8bc7c30232ef7d6570f))
+* **ui:** CSS Animations [#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/18) ([#27](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/27)) ([c0dadf8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c0dadf89274169b396089c2e7b3d69b043097186))
+* **ui:** implement CSS variables for theme support ([#26](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/26)) ([1f377de](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1f377de0f43aaf17271d29678a1accf11cfe121c)), closes [#17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/17)
+* **ui:** LESS Integration ([72fcf78](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/72fcf783b8ca5ce260e4b152016353e7dc1edb69)), closes [#15-Create-a-default-theme-with-Less-](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/15-Create-a-default-theme-with-Less-) [#23](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/23)
+* **ui:** UI now shows player names instead of their id ([#11](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/11)) ([c168ae7](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c168ae7dc05e99c1890661aa3b63f4d4d12779fb))

 ### Bug Fixes

-* **api:** Fixed websocket routing ([#88](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/88)) ([46c96d4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/46c96d4ceb935ac91fc515a1fdaef195e5ebc0a7))
-* **api:** fixes - reimplemented animations ([#90](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/90)) ([cfcd967](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/cfcd967ce08ecf07f3f06826c337f684eb3b0c5f))
-##  (2025-12-01)
+* **base:** fixed persistence logic ([#21](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/21)) ([7f765b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7f765b4514459202df3768c64a1df383fecb66e2))
+* **config:** modified git module to use the main branch ([#10](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/10)) ([ccf44ed](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/ccf44ede41e10df4b973c9cecc09d1e7105143f5))
+* **imports:** reorganized import statements for clarity and consistency ([#22](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/22)) ([1517d0c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1517d0c006247a95b02f66fa5bc53cc78b9d89fa))
+* **ui:** add light mode styles, update font families and fixed ui ([#24](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/24)) ([729a4ee](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/729a4eec6b721f8118d0feffa44721262ccd595f))
+* **ui:** added dark mode ([#25](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/25)) ([6c31fa0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/6c31fa0538e5d71c8be9a728eebf7576cb108782))
+* **ui:** changed backgrounds ([#33](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/33)) ([bef96ba](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bef96ba7e39a633c1972b01b1c1ebab9d1d3ee1c))
+
+### Reverts
+
+* ci: bump version to v1.0.0 [skip ci] ([91d7f6c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/91d7f6ca003edb368aba76b7a82c8b42d22bdbfe))
+##  (2025-11-03)
+
+### ⚠ BREAKING CHANGES
+
+* implemented multigame support (#34)

 ### Features

-* **api:** BAC-10 Websockets - Kick Users ([#93](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/93)) ([0541bb5](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/0541bb58d19efd98d134b3d0412f39b4b1001783))
-##  (2025-12-01)
-
-### Features
-
-* **api:** BAC-11 Websocket - Return to Lobby ([#94](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/94)) ([fd2467a](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/fd2467a9ea22dca64d5152a5a3e6db86d9a6f345))
-##  (2025-12-01)
+* **config:** add issue templates for Epics, User Stories, and Subtasks ([#4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/4)) ([d71809d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/d71809d6f4389b03ecc8ee9b857e58a4da413fa2))
+* implemented multigame support ([#34](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/34)) ([afde6c0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/afde6c02da2c3055084ae90ab6b11b63b0e11cfb))
+* **ui:** added rules ([#12](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/12)) ([92e4851](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/92e4851219e64ad919d7f8bc7c30232ef7d6570f))
+* **ui:** CSS Animations [#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/18) ([#27](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/27)) ([c0dadf8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c0dadf89274169b396089c2e7b3d69b043097186))
+* **ui:** implement CSS variables for theme support ([#26](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/26)) ([1f377de](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1f377de0f43aaf17271d29678a1accf11cfe121c)), closes [#17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/17)
+* **ui:** LESS Integration ([72fcf78](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/72fcf783b8ca5ce260e4b152016353e7dc1edb69)), closes [#15-Create-a-default-theme-with-Less-](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/15-Create-a-default-theme-with-Less-) [#23](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/23)
+* **ui:** UI now shows player names instead of their id ([#11](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/11)) ([c168ae7](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/c168ae7dc05e99c1890661aa3b63f4d4d12779fb))

 ### Bug Fixes

-* **api:** BAC-23 Remove old polling code ([#95](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/95)) ([a55f0b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/a55f0b4b6164a47e3524422650ed99d10f9c8b0d))
-##  (2025-12-01)
-
-### Bug Fixes
-
-* FRO-6 Websocket Close Handle ([#96](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/96)) ([3585566](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/358556612ec74601c8b31125e4e65f750abf8c4c))
-##  (2025-12-03)
-
-### Features
-
-* **ui:** FRO-7 Endscreen ([#97](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/97)) ([d57e6ef](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/d57e6efa985ca07c32f9f54595fe7393dbdf4d8a))
-##  (2025-12-03)
-##  (2025-12-03)
-##  (2025-12-04)
-
-### Bug Fixes
-
-* BAC-25 Race Condition: Websocket Promises ([#99](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/99)) ([f847424](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/f847424b9cea423ace5661d1efb6e4f01483c655))
-##  (2025-12-04)
-
-### Features
-
-* FRO-3 FRO-4 Added vue compontents to ingame and lobby ([#100](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/100)) ([194df56](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/194df5691ccda1c21ebe9157c4396a4a21aa921d))
-##  (2025-12-05)
-
-### Bug Fixes
-
-* BAC-29 Implement Mappers for Common Classes ([#101](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/101)) ([270f44c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/270f44cc1f3447ffcc33fb19a47c52391c69972b))
-##  (2025-12-06)
-
-### Features
-
-* BAC-30 Implement Jackson Mapping via DTOs ([#102](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/102)) ([8d697fd](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/8d697fd311478cf792b4631377de4522ecbda9f7))
-##  (2025-12-10)
-
-### Bug Fixes
-
-* FRO-29 Websocket Communication ([#104](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/104)) ([fa3d21e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/fa3d21e3038eb07369764850a9ad9badd269ac57))
-##  (2025-12-10)
-
-### Features
-
-* BAC-27 Implemented endpoint which returns information about the current state ([#103](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/103)) ([dd5e8e6](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/dd5e8e65e55f02a7618b3c60e8fc7087774e5106))
-##  (2025-12-10)
-
-### Features
-
-* FRO-2 Implement Login Component ([#105](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/105)) ([e8b31b1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e8b31b174819b5f033034501856c4b1189c4c4ee))
-##  (2025-12-10)
-
-### Features
-
-* FRO-20 Create scoreboard component ([#106](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/106)) ([2a29ca8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2a29ca8cdd3ef55f6f66f00b5e7727e1b1af1458))
-##  (2025-12-10)
-
-### Features
-
-* **api:** FRO-14 Create Game ([#107](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/107)) ([bd7a055](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bd7a055a0944a1c5219f21bb080bf658229f49e9))
-##  (2025-12-11)
-
-### Features
-
-* FRO-31 Small backend changes ([#108](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/108)) ([b17aae5](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b17aae5795b35ce3805db87c9bf741a5a96cd5ac))
-##  (2025-12-14)
-
-### Features
-
-* Update routing and websocket configuration for game state management ([#109](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/109)) ([35f6085](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/35f608513dd80eece46d49b40ecf31c8e915d307))
-##  (2025-12-18)
-
-### Features
-
-* **ui:** FRO-36 PWA ([#110](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/110)) ([e4384ee](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e4384ee8945ac462fe1f3580215117e0a438f71a))
-##  (2026-01-06)
-
-### Features
-
-* Enhance win effects and animations in OfflineView component ([088dda8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/088dda8d528edb9f3fd420e7e69eb44144d39eff))
-##  (2026-01-07)
-
-### Features
-
-* Add GatewayModule for enhanced module configuration ([1d05bd4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1d05bd43b482564636345322a2cecf58f7d229d0))
-* Enhance Dockerfile with secret management for GitHub credentials ([5f9ef2b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/5f9ef2beb0a6e7d5e8caf436f545bbd78a6b242e))
-* Simplify Dockerfile by removing multi-stage build and adjusting file copy paths ([e17f59e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e17f59e614a0060b70514c2337ac6fd84688546e))
-* Update build.sbt and Dockerfile for improved GitHub credentials handling ([8126b46](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/8126b46a0a1649d2b20b31975603f7610fafd18b))
-* Update build.sbt and Dockerfile for improved GitHub credentials handling ([25dd926](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/25dd9264b57ffafc5b01587ff5dda2e2188b5fbd))
-* Update Dockerfile for multi-platform support and add nginx configuration ([ccf993b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/ccf993bff25b4551a70c1f0263695f828df15a02))
-* Update Dockerfile for multi-platform support and add nginx configuration ([3e06734](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/3e067346ffe3bdc62dc936ea8e79ae9293d86351))
-* Update Dockerfile for multi-platform support and add nginx configuration ([b2527ed](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b2527ed041568d20f880515b406fe0b0e10c12c1))
+* **base:** fixed persistence logic ([#21](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/21)) ([7f765b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/7f765b4514459202df3768c64a1df383fecb66e2))
+* **config:** modified git module to use the main branch ([#10](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/10)) ([ccf44ed](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/ccf44ede41e10df4b973c9cecc09d1e7105143f5))
+* **imports:** reorganized import statements for clarity and consistency ([#22](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/22)) ([1517d0c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1517d0c006247a95b02f66fa5bc53cc78b9d89fa))
+* **ui:** add light mode styles, update font families and fixed ui ([#24](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/24)) ([729a4ee](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/729a4eec6b721f8118d0feffa44721262ccd595f))
+* **ui:** added dark mode ([#25](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/25)) ([6c31fa0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/6c31fa0538e5d71c8be9a728eebf7576cb108782))
+* **ui:** changed backgrounds ([#33](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/33)) ([bef96ba](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bef96ba7e39a633c1972b01b1c1ebab9d1d3ee1c))
--- a/19
+++ b/19
@@ -1,19 +0,0 @@
-FROM --platform=$TARGETPLATFORM eclipse-temurin:22-jre-alpine
-
-# Install Argon2 CLI and libraries
-RUN apk add --no-cache bash argon2 argon2-libs
-
-WORKDIR /opt/playapp
-
-# Copy staged Play build
-COPY ./knockoutwhistweb/target/universal/stage /opt/playapp
-
-# Expose the default Play port
-EXPOSE 9000
-
-# Set environment variables
-ENV PLAY_HTTP_PORT=9000
-
-# Run the Play app
-ENTRYPOINT ["./bin/knockoutwhistweb"]
-CMD ["-Dplay.server.pidfile.path=/dev/null"]
--- a/build.sbt
+++ b/build.sbt
@@ -1,19 +1,12 @@
 ThisBuild / scalaVersion := "3.5.1"

-credentials += Credentials(
-  "GitHub Package Registry",
-  "maven.pkg.github.com",
-  sys.env.getOrElse("GITHUB_USER", sys.error("GITHUB_USER not set")),
-  sys.env.getOrElse("GITHUB_TOKEN", sys.error("GITHUB_TOKEN not set"))
-)
-
 lazy val commonSettings = Seq(
-  libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.19",
-  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % "test",
-  libraryDependencies += "io.github.mkpaz" % "atlantafx-base" % "2.1.0",
-  libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.2-R36",
-  libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.4.0",
-  libraryDependencies += "org.playframework" %% "play-json" % "3.1.0-M9",
+  libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.18",
+  libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.18" % "test",
+  libraryDependencies += "io.github.mkpaz" % "atlantafx-base" % "2.0.1",
+  libraryDependencies += "org.scalafx" %% "scalafx" % "22.0.0-R33",
+  libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.3.0",
+  libraryDependencies += "org.playframework" %% "play-json" % "3.1.0-M1",
  libraryDependencies ++= {
    // Determine OS version of JavaFX binaries
    lazy val osName = System.getProperty("os.name") match {
@@ -26,6 +19,7 @@ lazy val commonSettings = Seq(
      .map(m => "org.openjfx" % s"javafx-$m" % "21" classifier osName)
  },
  libraryDependencies += guice,
+  coverageEnabled := true,
  coverageFailOnMinimum := true,
  coverageMinimumStmtTotal := 85,
  coverageMinimumBranchTotal := 100
@@ -42,17 +36,11 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb"))
  .enablePlugins(PlayScala)
  .dependsOn(knockoutwhist % "compile->compile;test->test")
  .settings(
-
-    resolvers += "GitHub Packages" at "https://maven.pkg.github.com/16Janis12/KnockOutWhist-Web",
-
    commonSettings,
    libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.2" % Test,
    libraryDependencies += "de.mkammerer" % "argon2-jvm" % "2.12",
-    libraryDependencies += "com.auth0" % "java-jwt" % "4.5.0",
-    libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.3",
-    libraryDependencies += "tools.jackson.module" %% "jackson-module-scala" % "3.0.2",
-    libraryDependencies += "de.janis" % "knockoutwhist-data" % "1.0-SNAPSHOT",
-    JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
+    libraryDependencies += "com.auth0" % "java-jwt" % "4.3.0",
+    libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.2"
  )

 lazy val root = (project in file("."))
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/knockoutwhistweb/app/assets/stylesheets/dark-mode.less
+++ b/knockoutwhistweb/app/assets/stylesheets/dark-mode.less
@@ -1,14 +1,6 @@
@media (prefers-color-scheme: dark) {
  :root {
-    --background-image: url('/assets/images/background.png') !important;
-    --color: #f8f9fa !important; /* Light text on dark bg */
-    --highlightscolor: rgba(131, 131, 131, 0.75) !important;
-    --background-color: #192734;
-    /* Bootstrap variable overrides for dark mode */
-    --bs-body-color: var(--color);
-    --bs-link-color: #66b2ff;
-    --bs-link-hover-color: #99ccff;
-    --bs-border-color: rgba(255, 255, 255, 0.2);
-    --bs-heading-color: var(--color);
+    --background-image: url('/assets/images/background.png');
+    --color: white;
  }
 }
--- a/knockoutwhistweb/app/assets/stylesheets/light-mode.less
+++ b/knockoutwhistweb/app/assets/stylesheets/light-mode.less
@@ -1,6 +1,4 @@
 :root {
  --background-image: url('/assets/images/img.png');
  --color: black;
-  --highlightscolor: rgba(0, 0, 0, 0.75);
-  --background-color: rgba(228, 232, 237, 1);
 }
--- a/knockoutwhistweb/app/assets/stylesheets/login.less
+++ b/knockoutwhistweb/app/assets/stylesheets/login.less
@@ -17,7 +17,7 @@
  width: 100%;
  border: none;
  border-radius: 1rem;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 20px rgba(0,0,0,0.1);
  position: relative;
  z-index: 3; /* ensure card sits above the particles */
 }
--- a/knockoutwhistweb/app/assets/stylesheets/main.less
+++ b/knockoutwhistweb/app/assets/stylesheets/main.less
@@ -2,295 +2,141 @@
@import "dark-mode.less";
@import "login.less";

-/* Provide default (light) variables so the site works even if light-mode.less fails */
-:root {
-  --background-image: url('/assets/images/img.png');
-  --color: #212529; /* Bootstrap body text default */
-
-  /* Bootstrap variable overrides for light mode */
-  --bs-body-color: var(--color) !important;
-  --bs-link-color: #0d6efd !important;
-  --bs-link-hover-color: #0a58ca !important;
-  --bs-border-color: rgba(0, 0, 0, 0.125) !important;
-  --bs-heading-color: var(--color) !important;
-}
-
-@background-color: var(--background-color);
-@highlightcolor: var(--highlightscolor);
@background-image: var(--background-image);
@color: var(--color);
@keyframes slideIn {
-  0% {
-    transform: translateX(-100vw);
-  }
-  100% {
-    transform: translateX(0);
-  }
+  0% { transform: translateX(-100vw); }
+  100% { transform: translateX(0); }
 }
-
 .game-field-background {
-  background-image: @background-image;
-  background-repeat: no-repeat;
-  background-size: cover;
-  max-width: 1400px;
-  margin: 0 auto;
-  min-height: 100vh;
-}
-
-.lobby-background {
-  background-color: @background-color;
-  width: 100%;
-  height: 100vh;
-}
-
-.navbar-header {
-  text-align: center;
-}
-
-.navbar-toggle {
-  float: none;
-  margin-right: 0;
-}
-
-.handcard :hover {
-  box-shadow: 3px 3px 3px @highlightcolor;
-}
-
-.inactive::after {
-  content: "";
-  position: absolute;
-  inset: 0; /* cover the whole container */
-  background: rgba(0, 0, 0, 0.50);
-  z-index: 10;
-  border-radius: 6px;
-  pointer-events: none; /* user can't click through overlay */
-}
-
-.bottom-div {
-  position: fixed;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  max-width: 1400px;
-  width: 100%;
-  margin: 0;
-  text-align: center;
-  padding: 10px;
-}
-
-/* Ensure body text color follows theme variable and works with Bootstrap */
-body {
-  color: @color;
-}
-
-.footer {
-  width: 100%;
-  text-align: center;
-  font-size: 12px;
-  color: @color;
-  padding: 0.5rem 0;
-  flex-grow: 1; /* fill remaining vertical space as visual footer background */
+    background-image: @background-image;
+    background-size: 100vw 100vh;
+    background-repeat: no-repeat;
 }

 .game-field {
-  position: fixed;
-  inset: 0;
-  overflow: auto;
+    position: fixed;
+    inset: 0;
+    overflow: auto;
 }
-
-.navbar-drop-shadow {
-  box-shadow: 0 1px 15px 0 #000000
-}
-
-.ingame-side-shadow {
-  box-shadow: 0 1px 15px 0 #000000
-}
-
 #sessions {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: center;
-  text-align: center;
-
-  h1 {
-    animation: slideIn 0.5s ease-out forwards;
-    animation-fill-mode: backwards;
-  }
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
+    text-align: center;
+    h1 {
+        animation: slideIn 0.5s ease-out forwards;
+        animation-fill-mode: backwards;
+    }
 }
-
 #textanimation {
-  animation: slideIn 0.5s ease-out forwards;
-  animation-fill-mode: backwards;
-  animation-delay: 1s;
+        animation: slideIn 0.5s ease-out forwards;
+        animation-fill-mode: backwards;
+        animation-delay: 1s;
 }

 #sessions a, #sessions h1, #sessions p {
-  color: @color;
-  font-size: 40px;
-  font-family: Arial, serif;
+    color: @color;
+    font-size: 40px;
+    font-family: Arial, serif;
 }
-
 #ingame {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: flex-end;
-  height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    height: 100%;
 }
-
 #ingame a, #ingame h1, #ingame p {
-  color: @color;
-  font-size: 40px;
-  font-family: Arial, serif;
+    color: @color;
+    font-size: 40px;
+    font-family: Arial, serif;
+}
+#playercards {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    height: 20%;
+    img {
+        animation: slideIn 0.5s ease-out forwards;
+        animation-fill-mode: backwards;
+        &:nth-child(1) { animation-delay: 0.5s; }
+        &:nth-child(2) { animation-delay: 1s; }
+        &:nth-child(3) { animation-delay: 1.5s; }
+        &:nth-child(4) { animation-delay: 2s; }
+        &:nth-child(5) { animation-delay: 2.5s; }
+        &:nth-child(6) { animation-delay: 3s; }
+        &:nth-child(7) { animation-delay: 3.5s; }
+    }
 }

-.ingame-cards-slide {
-  div {
-    animation: slideIn 0.5s ease-out forwards;
-    animation-fill-mode: backwards;

-    &:nth-child(1) {
-      animation-delay: 0.5s;
-    }
-
-    &:nth-child(2) {
-      animation-delay: 1s;
-    }
-
-    &:nth-child(3) {
-      animation-delay: 1.5s;
-    }
-
-    &:nth-child(4) {
-      animation-delay: 2s;
-    }
-
-    &:nth-child(5) {
-      animation-delay: 2.5s;
-    }
-
-    &:nth-child(6) {
-      animation-delay: 3s;
-    }
-
-    &:nth-child(7) {
-      animation-delay: 3.5s;
-    }
-  }
+#cardsplayed {
+    display: flex;
+    flex-direction: row;
+    height: 10%;
+    min-height: 10%
 }
-
 #playedcardplayer {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
 }
-
 #playedcardplayer p {
-  font-size: 12px;
-  height: 4%;
+    font-size: 12px;
+    height: 4%;
 }
-
 #playedcardplayer img {
-  height: 90%;
+    height: 90%;
 }

 #firstCard {
-  display: flex;
-  flex-direction: row;
-  height: 20%;
-  width: 100%;
-  justify-content: space-between;
+    display: flex;
+    flex-direction: row;
+    height: 20%;
+    width: 100%;
+    justify-content: space-between;
 }
-
 #firstCardObject {
-  display: flex;
-  flex-direction: column;
-  margin-right: 4%;
+    display: flex;
+    flex-direction: column;
+    margin-right: 4%;
 }
-
-#firstCardObject img {
-  height: 90%;
+#firstCardObject img{
+    height: 90%;
 }
-
-#firstCardObject p {
-  height: 10%;
-  font-size: 20px;
+#firstCardObject p{
+    height: 10%;
+    font-size: 20px;

 }
-
-#next-players-container {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  height: 0;
-
-  p {
-    margin-top: 0;
-    margin-bottom: 0;
-  }
+#trumpsuit {
+    display: flex;
+    flex-direction: row;
+    margin-left: 4%;
+}
+#nextPlayers {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    height: 0;
+    p {
+        margin-top: 0;
+        margin-bottom: 0;
+    }
+}
+#invisible {
+    visibility: hidden;
 }
-
 #selecttrumpsuit {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    height: 100%;
 }
-
 #rules {
-  color: @color;
-  font-size: 1.5em;
-  font-family: Arial, serif;
-}
-
-.score-table {
-  background-color: rgba(255, 255, 255, 0.1);
-  border-radius: 8px;
-  padding: 10px;
-  margin-bottom: 20px;
-  backdrop-filter: blur(8px);
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-.score-header {
-  font-weight: bold;
-  color: #000000;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-}
-
-.score-row {
-  color: #000000;
-}
-
-/* In-game centered stage and blurred sides overlay */
-.ingame-stage {
-  min-height: 100vh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 2rem 1rem;
-}
-
-/* Wrapper that adds a backdrop blur to the background outside the centered card */
-.blur-sides {
-  position: relative;
-}
-
-/* Create an overlay that blurs everything behind it, except the central content area */
-.blur-sides::before {
-  content: "";
-  position: fixed;
-  inset: 0;
-  pointer-events: none;
-  /* fallback: subtle vignette if backdrop-filter unsupported */
-  background: radial-gradient(ellipse at center, rgba(0, 0, 0, 0) 30%, rgba(0, 0, 0, 0.35) 100%);
-}
-
-@supports ((-webkit-backdrop-filter: blur(8px)) or (backdrop-filter: blur(8px))) {
-  .blur-sides::before {
-    background: rgba(0, 0, 0, 0.08);
-    -webkit-backdrop-filter: blur(10px) saturate(110%);
-    backdrop-filter: blur(10px) saturate(110%);
-  }
+    color: @color;
+    font-size: 1.5em;
+    font-family: Arial, serif;
 }
--- a/knockoutwhistweb/app/auth/AuthAction.scala
+++ b/knockoutwhistweb/app/auth/AuthAction.scala
@@ -15,6 +15,13 @@ class AuthAction @Inject()(val sessionManager: SessionManager, val parser: BodyP

  override def executionContext: ExecutionContext = ec
  
+  private def getUserFromSession(request: RequestHeader): Option[User] = {
+    val session = request.cookies.get("sessionId")
+    if (session.isDefined)
+      return sessionManager.getUserBySession(session.get.value)
+    None
+  }
+  
  override def invokeBlock[A](
                               request: Request[A],
                               block: AuthenticatedRequest[A] => Future[Result]
@@ -23,15 +30,8 @@ class AuthAction @Inject()(val sessionManager: SessionManager, val parser: BodyP
      case Some(user) =>
        block(new AuthenticatedRequest(user, request))
      case None =>
-        Future.successful(Results.Unauthorized)
+        Future.successful(Results.Redirect(routes.UserController.login()))
    }
  }
-
-  protected def getUserFromSession(request: RequestHeader): Option[User] = {
-    val session = request.cookies.get("accessToken")
-    if (session.isDefined)
-      return sessionManager.getUserBySession(session.get.value)
-    None
-  }
 }

--- a/knockoutwhistweb/app/components/WebApplicationConfiguration.scala
+++ b/knockoutwhistweb/app/components/WebApplicationConfiguration.scala
@@ -2,13 +2,11 @@ package components

 import de.knockoutwhist.components.DefaultConfiguration
 import de.knockoutwhist.ui.UI
-import de.knockoutwhist.utils.DelayHandler
 import de.knockoutwhist.utils.events.EventListener

 class WebApplicationConfiguration extends DefaultConfiguration {

  override def uis: Set[UI] = Set()
-
-  override def listener: Set[EventListener] = Set(DelayHandler)
+  override def listener: Set[EventListener] = Set()

 }
--- a/knockoutwhistweb/app/controllers/IngameController.scala
+++ b/knockoutwhistweb/app/controllers/IngameController.scala
@@ -1,50 +1,60 @@
 package controllers

 import auth.{AuthAction, AuthenticatedRequest}
-import de.knockoutwhist.control.GameState
-import de.knockoutwhist.control.GameState.*
-import exceptions.*
+import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak}
+import exceptions.{CantPlayCardException, GameFullException, NotEnoughPlayersException, NotHostException, NotInThisGameException}
 import logic.PodManager
-import logic.game.GameLobby
-import model.sessions.UserSession
-import model.users.User
+import model.sessions.{PlayerSession, UserSession}
 import play.api.*
-import play.api.libs.json.{JsValue, Json}
 import play.api.mvc.*
-import play.twirl.api.Html
-import util.GameUtil

 import java.util.UUID
 import javax.inject.*
-import scala.concurrent.ExecutionContext
 import scala.util.Try

+
+/**
+ * This controller creates an `Action` to handle HTTP requests to the
+ * application's home page.
+ */
@Singleton
 class IngameController @Inject()(
-                                  val cc: ControllerComponents,
+                                  val controllerComponents: ControllerComponents,
                                  val authAction: AuthAction,
-                                  implicit val ec: ExecutionContext
-                                ) extends AbstractController(cc) {
+                                  val podManager: PodManager
+                                ) extends BaseController {

  def game(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val results = Try {
-          IngameController.returnInnerHTML(g, g.logic.getCurrentState, request.user)
-        }
-        if (results.isSuccess) {
-          Ok(views.html.main("Knockout Whist - " + GameUtil.stateToTitle(g.logic.getCurrentState))(results.get))
-        } else {
-          InternalServerError(results.failed.get.getMessage)
+        g.logic.getCurrentState match {
+          case Lobby => Ok(views.html.lobby.lobby(Some(request.user), g))
+          case InGame =>
+            Ok(views.html.ingame.ingame(
+              g.getPlayerByUser(request.user),
+              g
+            ))
+          case SelectTrump =>
+            Ok(views.html.ingame.selecttrump(
+              g.getPlayerByUser(request.user),
+              g.logic
+            ))
+          case TieBreak =>
+            Ok(views.html.ingame.tie(
+              g.getPlayerByUser(request.user),
+              g.logic
+            ))
+          case _ =>
+            InternalServerError(s"Invalid game state for in-game view. GameId: $gameId" + s" State: ${g.logic.getCurrentState}")
        }
      case None =>
-        Redirect(routes.MainMenuController.mainMenu())
+        NotFound("Game not found")
    }
+    //NotFound(s"Reached end of game method unexpectedly. GameId: $gameId")
  }
-
  def startGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
    val result = Try {
      game match {
        case Some(g) =>
@@ -54,84 +64,62 @@ class IngameController @Inject()(
      }
    }
    if (result.isSuccess) {
-      Ok(Json.obj(
-        "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameId).url,
-        "content" -> IngameController.returnInnerHTML(game.get, game.get.logic.getCurrentState, request.user).toString()
-      ))
+      Redirect(routes.IngameController.game(gameId))
    } else {
      val throwable = result.failed.get
      throwable match {
        case _: NotInThisGameException =>
-          BadRequest(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          BadRequest(throwable.getMessage)
        case _: NotHostException =>
-          Forbidden(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          Forbidden(throwable.getMessage)
        case _: NotEnoughPlayersException =>
-          BadRequest(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          BadRequest(throwable.getMessage)
        case _ =>
-          InternalServerError(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          InternalServerError(throwable.getMessage)
      }
    }
  }
-
-  def kickPlayer(gameId: String, playerToKick: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
-    val playerToKickUUID = UUID.fromString(playerToKick)
-    val result = Try {
-      game.get.leaveGame(playerToKickUUID, true)
-    }
-    if (result.isSuccess) {
-      Ok(Json.obj(
-        "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameId).url
-      ))
-    } else {
-      InternalServerError(Json.obj(
-        "status" -> "failure",
-        "errorMessage" -> "Something went wrong."
-      ))
-    }
+  def kickPlayer(gameId: String, playerToKick: UUID): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = podManager.getGame(gameId)
+    game.get.leaveGame(playerToKick)
+    Redirect(routes.IngameController.game(gameId))
  }
-
  def leaveGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
+    game.get.leaveGame(request.user.id)
+    Redirect(routes.MainMenuController.mainMenu())
+  }
+  def joinGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = podManager.getGame(gameId)
    val result = Try {
-      game.get.leaveGame(request.user.id, false)
+      game match {
+        case Some(g) =>
+          g.addUser(request.user)
+        case None =>
+          NotFound("Game not found")
+      }
    }
    if (result.isSuccess) {
-      Ok(Json.obj(
-        "status" -> "success",
-        "redirectUrl" -> routes.MainMenuController.mainMenu().url,
-        "content" -> views.html.mainmenu.creategame(Some(request.user)).toString
-      ))
+      Redirect(routes.IngameController.game(gameId))
    } else {
-      InternalServerError(Json.obj(
-        "status" -> "failure",
-        "errorMessage" -> "Something went wrong."
-      ))
+      val throwable = result.failed.get
+      throwable match {
+        case _: GameFullException =>
+          BadRequest(throwable.getMessage)
+        case _: IllegalArgumentException =>
+          BadRequest(throwable.getMessage)
+        case _: IllegalStateException =>
+          BadRequest(throwable.getMessage)
+        case _ =>
+          InternalServerError(throwable.getMessage)
+      }
    }
  }
-
  def playCard(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] => {
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val jsonBody = request.body.asJson
-        val cardIdOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "cardID").asOpt[String]
-        }
+        val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
        cardIdOpt match {
          case Some(cardId) =>
            var optSession: Option[UserSession] = None
@@ -143,67 +131,35 @@ class IngameController @Inject()(
            }
            optSession.foreach(_.lock.unlock())
            if (result.isSuccess) {
-              Ok(Json.obj(
-                "status" -> "success"
-              ))
+              NoContent
            } else {
              val throwable = result.failed.get
              throwable match {
                case _: CantPlayCardException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: NotInThisGameException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: IllegalArgumentException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: IllegalStateException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
-                case _: NotInteractableException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _ =>
-                  InternalServerError(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  InternalServerError(throwable.getMessage)
              }
            }
          case None =>
-            BadRequest(Json.obj(
-              "status" -> "failure",
-              "errorMessage" -> "cardId Parameter is missing"
-            ))
+            BadRequest("cardId parameter is missing")
        }
      case None =>
-        NotFound(Json.obj(
-          "status" -> "failure",
-          "errorMessage" -> "Game not found"
-        ))
+        NotFound("Game not found")
    }
  }
  }
-
  def playDogCard(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] => {
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
    game match {
      case Some(g) => {
-        val jsonBody = request.body.asJson
-        val cardIdOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "cardID").asOpt[String]
-        }
+        val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
        var optSession: Option[UserSession] = None
        val result = Try {
          cardIdOpt match {
@@ -228,30 +184,15 @@ class IngameController @Inject()(
          val throwable = result.failed.get
          throwable match {
            case _: CantPlayCardException =>
-              BadRequest(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
+              BadRequest(throwable.getMessage)
            case _: NotInThisGameException =>
-              BadRequest(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
+              BadRequest(throwable.getMessage)
            case _: IllegalArgumentException =>
-              BadRequest(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
+              BadRequest(throwable.getMessage)
            case _: IllegalStateException =>
-              BadRequest(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
+              BadRequest(throwable.getMessage)
            case _ =>
-              InternalServerError(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
+              InternalServerError(throwable.getMessage)
          }
        }
      }
@@ -260,15 +201,11 @@ class IngameController @Inject()(
    }
  }
  }
-
  def playTrump(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val jsonBody = request.body.asJson
-        val trumpOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "trump").asOpt[String]
-        }
+        val trumpOpt = request.body.asFormUrlEncoded.flatMap(_.get("trump").flatMap(_.headOption))
        trumpOpt match {
          case Some(trump) =>
            var optSession: Option[UserSession] = None
@@ -285,25 +222,13 @@ class IngameController @Inject()(
              val throwable = result.failed.get
              throwable match {
                case _: IllegalArgumentException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: NotInThisGameException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: IllegalStateException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _ =>
-                  InternalServerError(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  InternalServerError(throwable.getMessage)
              }
            }
          case None =>
@@ -313,15 +238,11 @@ class IngameController @Inject()(
        NotFound("Game not found")
    }
  }
-
  def playTie(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
+    val game = podManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val jsonBody = request.body.asJson
-        val tieOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "tie").asOpt[String]
-        }
+        val tieOpt = request.body.asFormUrlEncoded.flatMap(_.get("tie").flatMap(_.headOption))
        tieOpt match {
          case Some(tie) =>
            var optSession: Option[UserSession] = None
@@ -338,25 +259,13 @@ class IngameController @Inject()(
              val throwable = result.failed.get
              throwable match {
                case _: IllegalArgumentException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: NotInThisGameException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: IllegalStateException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _ =>
-                  InternalServerError(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  InternalServerError(throwable.getMessage)
              }
            }
          case None =>
@@ -367,78 +276,4 @@ class IngameController @Inject()(
    }
  }

-
-  def returnToLobby(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val game = PodManager.getGame(gameId)
-    game match {
-      case Some(g) =>
-        val result = Try {
-          val session = g.getUserSession(request.user.id)
-          g.returnToLobby(session)
-        }
-        if (result.isSuccess) {
-          Ok(Json.obj(
-            "status" -> "success",
-            "redirectUrl" -> routes.IngameController.game(gameId).url
-          ))
-        } else {
-          val throwable = result.failed.get
-          throwable match {
-            case _: NotInThisGameException =>
-              BadRequest(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
-            case _: IllegalStateException =>
-              BadRequest(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
-            case _ =>
-              InternalServerError(Json.obj(
-                "status" -> "failure",
-                "errorMessage" -> throwable.getMessage
-              ))
-          }
-        }
-      case None =>
-        NotFound(Json.obj(
-          "status" -> "failure",
-          "errorMessage" -> "Game not found"
-        ))
-    }
-  }
-  
-}
-
-object IngameController {
-
-  def returnInnerHTML(gameLobby: GameLobby, gameState: GameState, user: User): Html = {
-    gameState match {
-      case Lobby => views.html.lobby.lobby(Some(user), gameLobby)
-      case InGame =>
-        views.html.ingame.ingame(
-          gameLobby.getPlayerByUser(user),
-          gameLobby
-        )
-      case SelectTrump =>
-        views.html.ingame.selecttrump(
-          gameLobby.getPlayerByUser(user),
-          gameLobby
-        )
-      case TieBreak =>
-        views.html.ingame.tie(
-          gameLobby.getPlayerByUser(user),
-          gameLobby
-        )
-      case FinishedMatch =>
-        views.html.ingame.finishedMatch(
-          Some(user),
-          gameLobby
-        )
-      case _ =>
-        throw new IllegalStateException(s"Invalid game state for in-game view. GameId: ${gameLobby.id}" + s" State: ${gameLobby.logic.getCurrentState}")
-    }
-  }
-  
 }
--- a/knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala
+++ b/knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala
@@ -1,24 +0,0 @@
-package controllers
-
-import auth.AuthAction
-import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
-import play.api.routing.JavaScriptReverseRouter
-
-import javax.inject.Inject
-
-class JavaScriptRoutingController @Inject()(
-                                             val controllerComponents: ControllerComponents,
-                                             val authAction: AuthAction,
-                                           ) extends BaseController {
-  def javascriptRoutes(): Action[AnyContent] =
-    Action { implicit request =>
-      Ok(
-        JavaScriptReverseRouter("jsRoutes")(
-          routes.javascript.MainMenuController.createGame,
-          routes.javascript.MainMenuController.joinGame,
-          routes.javascript.MainMenuController.navSPA,
-          routes.javascript.UserController.login_Post
-        )
-      ).as("text/javascript")
-    }
-}
--- a/knockoutwhistweb/app/controllers/MainMenuController.scala
+++ b/knockoutwhistweb/app/controllers/MainMenuController.scala
@@ -3,7 +3,6 @@ package controllers
 import auth.{AuthAction, AuthenticatedRequest}
 import logic.PodManager
 import play.api.*
-import play.api.libs.json.Json
 import play.api.mvc.*

 import javax.inject.*
@@ -16,12 +15,13 @@ import javax.inject.*
@Singleton
 class MainMenuController @Inject()(
                                    val controllerComponents: ControllerComponents,
-                                    val authAction: AuthAction
+                                    val authAction: AuthAction,
+                                    val podManager: PodManager
                                  ) extends BaseController {

  // Pass the request-handling function directly to authAction (no nested Action)
  def mainMenu(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    Ok(views.html.main("Knockout Whist - Create Game")(views.html.mainmenu.creategame(Some(request.user))))
+    Ok(views.html.mainmenu.creategame(Some(request.user)))
  }

  def index(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
@@ -29,85 +29,41 @@ class MainMenuController @Inject()(
  }

  def createGame(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val jsonBody = request.body.asJson
-    if (jsonBody.isDefined) {
-      val gamename: String = (jsonBody.get \ "lobbyname").asOpt[String]
-        .getOrElse(s"${request.user.name}'s Game")
-
-      val playeramount: String = (jsonBody.get \ "playeramount").asOpt[String]
-        .getOrElse(throw new IllegalArgumentException("Player amount is required."))
-
-      val gameLobby = PodManager.createGame(
+    val postData = request.body.asFormUrlEncoded
+    if (postData.isDefined) {
+      val gamename = postData.get.get("lobbyname").flatMap(_.headOption).getOrElse(s"${request.user.name}'s Game")
+      val playeramount = postData.get.get("playeramount").flatMap(_.headOption).getOrElse("")
+      val gameLobby = podManager.createGame(
        host = request.user,
        name = gamename,
        maxPlayers = playeramount.toInt
      )
-      Ok(Json.obj(
-        "status" -> "success",
-        "gameId" -> gameLobby.id,
-      ))
+      Redirect(routes.IngameController.game(gameLobby.id))
    } else {
-      BadRequest(Json.obj(
-        "status" -> "failure",
-        "errorMessage" -> "Invalid form submission"
-      ))
+      BadRequest("Invalid form submission")
    }
    
  }
  
  def joinGame(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val jsonBody = request.body.asJson
-    val gameId: Option[String] = jsonBody.flatMap { jsValue =>
-      (jsValue \ "gameId").asOpt[String]
-    }
-    if (gameId.isDefined) {
-      val game = PodManager.getGame(gameId.get)
+    val postData = request.body.asFormUrlEncoded
+    if (postData.isDefined) {
+      val gameId = postData.get.get("gameId").flatMap(_.headOption).getOrElse("")
+      val game = podManager.getGame(gameId)
      game match {
        case Some(g) =>
-          g.addUser(request.user)
-          Ok(Json.obj(
-            "status" -> "success",
-            "redirectUrl" -> routes.IngameController.game(g.id).url,
-            "content" -> IngameController.returnInnerHTML(g, g.logic.getCurrentState, request.user).toString
-          ))
+          Redirect(routes.IngameController.joinGame(gameId))
        case None =>
-          NotFound(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> "No Game found"
-          ))
+          NotFound("Game not found")
      }
    } else {
-      BadRequest(Json.obj(
-        "status" -> "failure",
-        "errorMessage" -> "Invalid form submission"
-      ))
+      BadRequest("Invalid form submission")
    }
  }

-  def rules(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    Ok(views.html.main("Knockout Whist - Rules")(views.html.mainmenu.rules(Some(request.user))))
-  }
-
-  def navSPA(location: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    location match {
-      case "0" => // Main Menu
-        Ok(Json.obj(
-          "status" -> "success",
-          "redirectUrl" -> routes.MainMenuController.mainMenu().url,
-          "content" -> views.html.mainmenu.creategame(Some(request.user)).toString
-        ))
-      case "1" => // Rules
-        Ok(Json.obj(
-          "status" -> "success",
-          "redirectUrl" -> routes.MainMenuController.rules().url,
-          "content" -> views.html.mainmenu.rules(Some(request.user)).toString
-        ))
-      case _ =>
-        BadRequest(Json.obj(
-          "status" -> "failure",
-          "errorMessage" -> "Invalid form submission"
-        ))
+  def rules(): Action[AnyContent] = {
+    Action { implicit request =>
+      Ok(views.html.mainmenu.rules())
    }
  }
-
 }
--- a/knockoutwhistweb/app/controllers/StatusController.scala
+++ b/knockoutwhistweb/app/controllers/StatusController.scala
@@ -1,94 +0,0 @@
-package controllers
-
-import auth.AuthAction
-import logic.PodManager
-import logic.game.GameLobby
-import logic.user.SessionManager
-import model.users.User
-import play.api.libs.json.{JsValue, Json}
-import play.api.mvc.*
-import util.WebsocketEventMapper
-
-import javax.inject.Inject
-
-class StatusController @Inject()(
-                                  val controllerComponents: ControllerComponents,
-                                  val sessionManager: SessionManager,
-                                  val authAction: AuthAction
-                                ) extends BaseController {
-
-  def requestStatus(): Action[AnyContent] = {
-    Action { implicit request =>
-      val userOpt = getUserFromSession(request)
-      if (userOpt.isEmpty) {
-        Ok(
-          Json.obj(
-            "status" -> "unauthenticated"
-          )
-        )
-      } else {
-        val user = userOpt.get
-        val gameOpt = PodManager.identifyGameOfUser(user)
-        if (gameOpt.isEmpty) {
-          Ok(
-            Json.obj(
-              "status" -> "authenticated",
-              "username" -> user.name,
-              "inGame" -> false
-            )
-          )
-        } else {
-          val game = gameOpt.get
-          Ok(
-            Json.obj(
-              "status" -> "authenticated",
-              "username" -> user.name,
-              "inGame" -> true,
-              "gameId" -> game.id
-            )
-          )
-        }
-      }
-    }
-  }
-
-  def game(gameId: String): Action[AnyContent] = {
-    Action { implicit request =>
-    val userOpt = getUserFromSession(request)
-    if (userOpt.isEmpty) {
-      Unauthorized("User not authenticated")
-    } else {
-      val user = userOpt.get
-      val gameOpt = PodManager.getGame(gameId)
-      if (gameOpt.isEmpty) {
-        NotFound("Game not found")
-      } else {
-        val game = gameOpt.get
-        if (!game.getPlayers.contains(user.id)) {
-          Forbidden("User not part of this game")
-        } else {
-          Ok(
-            Json.obj(
-              "gameId" -> game.id,
-              "state" -> game.logic.getCurrentState.toString,
-              "data" -> mapGameState(game, user) 
-            )
-          )
-        }
-      }
-    }
-  }}
-
-  private def getUserFromSession(request: RequestHeader): Option[User] = {
-    val session = request.cookies.get("accessToken")
-    if (session.isDefined)
-      return sessionManager.getUserBySession(session.get.value)
-    None
-  }
-  
-  private def mapGameState(gameLobby: GameLobby, user: User): JsValue = {
-    val userSession = gameLobby.getUserSession(user.id)
-    WebsocketEventMapper.stateToJson(userSession)
-  }
-
-}
--- a/knockoutwhistweb/app/controllers/UserController.scala
+++ b/knockoutwhistweb/app/controllers/UserController.scala
@@ -1,13 +1,9 @@
 package controllers

 import auth.{AuthAction, AuthenticatedRequest}
-import dto.subDTO.UserDTO
 import logic.user.{SessionManager, UserManager}
-import model.users.User
 import play.api.*
-import play.api.libs.json.Json
 import play.api.mvc.*
-import play.api.mvc.Cookie.SameSite.{Lax, None, Strict}

 import javax.inject.*

@@ -24,32 +20,36 @@ class UserController @Inject()(
                                val authAction: AuthAction
                              ) extends BaseController {

+  def login(): Action[AnyContent] = {
+    Action { implicit request =>
+      val session = request.cookies.get("sessionId")
+      if (session.isDefined) {
+        val possibleUser = sessionManager.getUserBySession(session.get.value)
+        if (possibleUser.isDefined) {
+          Redirect(routes.MainMenuController.mainMenu())
+        } else {
+          Ok(views.html.login.login())
+        }
+      } else {
+        Ok(views.html.login.login())
+      }
+    }
+  }
+
  def login_Post(): Action[AnyContent] = {
    Action { implicit request =>
-      val jsonBody = request.body.asJson
-      val username: Option[String] = jsonBody.flatMap { jsValue =>
-        (jsValue \ "username").asOpt[String]
-      }
-      val password: Option[String] = jsonBody.flatMap { jsValue =>
-        (jsValue \ "password").asOpt[String]
-      }
-      if (username.isDefined && password.isDefined) {
+      val postData = request.body.asFormUrlEncoded
+      if (postData.isDefined) {
        // Extract username and password from form data
-        val possibleUser = userManager.authenticate(username.get, password.get)
+        val username = postData.get.get("username").flatMap(_.headOption).getOrElse("")
+        val password = postData.get.get("password").flatMap(_.headOption).getOrElse("")
+        val possibleUser = userManager.authenticate(username, password)
        if (possibleUser.isDefined) {
-          Ok(Json.obj(
-            "user" -> Json.obj(
-              "id" -> possibleUser.get.id,
-              "username" -> possibleUser.get.name
-            )
-          )).withCookies(Cookie(
-            name = "accessToken",
-            value = sessionManager.createSession(possibleUser.get),
-            httpOnly = true,
-            secure = false,
-            sameSite = Some(Lax)
-          ))
+          Redirect(routes.MainMenuController.mainMenu()).withCookies(
+            Cookie("sessionId", sessionManager.createSession(possibleUser.get))
+          )
        } else {
+          println("Failed login attempt for user: " + username)
          Unauthorized("Invalid username or password")
        }
      } else {
@@ -58,20 +58,13 @@ class UserController @Inject()(
    }
  }

-  def getUserInfo(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val user: User = request.user
-    Ok(Json.obj(
-      "id" -> user.id,
-      "username" -> user.name
-    ))
-  }
-
-  def logoutPost(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val sessionCookie = request.cookies.get("accessToken")
+  // Pass the request-handling function directly to authAction (no nested Action)
+  def logout(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val sessionCookie = request.cookies.get("sessionId")
    if (sessionCookie.isDefined) {
      sessionManager.invalidateSession(sessionCookie.get.value)
    }
-    NoContent.discardingCookies(DiscardingCookie("accessToken"))
+    Redirect(routes.UserController.login()).discardingCookies(DiscardingCookie("sessionId"))
  }

 }
--- a/knockoutwhistweb/app/controllers/WebsocketController.scala
+++ b/knockoutwhistweb/app/controllers/WebsocketController.scala
@@ -1,45 +0,0 @@
-package controllers
-
-
-import auth.AuthAction
-import logic.PodManager
-import logic.user.SessionManager
-import model.sessions.{UserSession, UserWebsocketActor}
-import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
-import org.apache.pekko.stream.Materializer
-import play.api.*
-import play.api.libs.streams.ActorFlow
-import play.api.mvc.*
-
-import javax.inject.*
-
-
-@Singleton
-class WebsocketController @Inject()(
-                                     cc: ControllerComponents,
-                                     val sessionManger: SessionManager,
-                                   )(implicit system: ActorSystem, mat: Materializer) extends AbstractController(cc) {
-
-  def socket(): WebSocket = WebSocket.accept[String, String] { request =>
-    val session = request.cookies.get("accessToken")
-    if (session.isEmpty) throw new Exception("No session cookie found")
-    val userOpt = sessionManger.getUserBySession(session.get.value)
-    if (userOpt.isEmpty) throw new Exception("Invalid session")
-    val user = userOpt.get
-    val game = PodManager.identifyGameOfUser(user)
-    if (game.isEmpty) throw new Exception("User is not in a game")
-    val userSession = game.get.getUserSession(user.id)
-    ActorFlow.actorRef { out =>
-      println("Connect received")
-      KnockOutWebSocketActorFactory.create(out, userSession)
-    }
-  }
-
-  object KnockOutWebSocketActorFactory {
-    def create(out: ActorRef, userSession: UserSession): Props = {
-      Props(new UserWebsocketActor(out, userSession))
-    }
-  }
-
-
-}
--- a/knockoutwhistweb/app/dto/GameInfoDTO.scala
+++ b/knockoutwhistweb/app/dto/GameInfoDTO.scala
@@ -1,35 +0,0 @@
-package dto
-
-import dto.subDTO.*
-import logic.game.GameLobby
-import model.users.User
-
-import scala.util.Try
-
-case class GameInfoDTO(
-                      gameId: String,
-                      self: Option[PlayerDTO],
-                      hand: Option[HandDTO],
-                      playerQueue: PlayerQueueDTO,
-                      currentTrick: Option[TrickDTO],
-                      currentRound: Option[RoundDTO]
-                      )
-
-object GameInfoDTO {
-
-  def apply(lobby: GameLobby, user: User): GameInfoDTO = {
-    val selfPlayer = Try {
-      Some(lobby.getPlayerByUser(user))
-    }.getOrElse(None)
-    
-    GameInfoDTO(
-      gameId = lobby.id,
-      self = selfPlayer.map(PlayerDTO(_)),
-      hand = selfPlayer.flatMap(_.currentHand()).map(HandDTO(_)),
-      playerQueue = PlayerQueueDTO(lobby.logic),
-      currentTrick = lobby.logic.getCurrentTrick.map(TrickDTO(_)),
-      currentRound = lobby.logic.getCurrentRound.map(r => RoundDTO(r, lobby.logic.getCurrentMatch))
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/dto/LobbyInfoDTO.scala
+++ b/knockoutwhistweb/app/dto/LobbyInfoDTO.scala
@@ -1,22 +0,0 @@
-package dto
-
-import dto.subDTO.UserDTO
-import logic.game.GameLobby
-import model.users.User
-
-case class LobbyInfoDTO(gameId: String, users: List[UserDTO], self: UserDTO, maxPlayers: Int)
-
-object LobbyInfoDTO {
-
-  def apply(lobby: GameLobby, user: User): LobbyInfoDTO = {
-    val session = lobby.getUserSession(user.id)
-    
-    LobbyInfoDTO(
-      gameId = lobby.id,
-      users = lobby.getPlayers.values.map(user => UserDTO(user)).toList,
-      self = UserDTO(session),
-      maxPlayers = lobby.maxPlayers,
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/dto/TieInfoDTO.scala
+++ b/knockoutwhistweb/app/dto/TieInfoDTO.scala
@@ -1,27 +0,0 @@
-package dto
-
-import dto.subDTO.PlayerDTO
-import logic.game.GameLobby
-import model.users.User
-
-import scala.util.Try
-
-case class TieInfoDTO(gameId: String, currentPlayer: Option[PlayerDTO], self: Option[PlayerDTO], tiedPlayers: Seq[PlayerDTO], highestAmount: Int)
-
-object TieInfoDTO {
-
-  def apply(lobby: GameLobby, user: User): TieInfoDTO = {
-    val selfPlayer = Try {
-      Some(lobby.getPlayerByUser(user))
-    }.getOrElse(None)
-
-    TieInfoDTO(
-      gameId = lobby.id,
-      currentPlayer = lobby.logic.playerTieLogic.currentTiePlayer().map(PlayerDTO.apply),
-      self = selfPlayer.map(PlayerDTO.apply),
-      tiedPlayers = lobby.logic.playerTieLogic.getTiedPlayers.map(PlayerDTO.apply),
-      highestAmount = lobby.logic.playerTieLogic.highestAllowedNumber()
-    )
-  }
-  
-}
--- a/knockoutwhistweb/app/dto/TrumpInfoDTO.scala
+++ b/knockoutwhistweb/app/dto/TrumpInfoDTO.scala
@@ -1,31 +0,0 @@
-package dto
-
-import dto.subDTO.{HandDTO, PlayerDTO}
-import logic.game.GameLobby
-import model.users.User
-
-import scala.util.Try
-
-case class TrumpInfoDTO(
-                       gameId: String,
-                       chooser: Option[PlayerDTO],
-                       self: Option[PlayerDTO],
-                       selfHand: Option[HandDTO],
-                       )
-
-object TrumpInfoDTO {
-
-  def apply(lobby: GameLobby, user: User): TrumpInfoDTO = {
-    val selfPlayer = Try {
-      Some(lobby.getPlayerByUser(user))
-    }.getOrElse(None)
-
-    TrumpInfoDTO(
-      gameId = lobby.id,
-      chooser = lobby.logic.getTrumpPlayer.map(PlayerDTO(_)),
-      self = selfPlayer.map(PlayerDTO(_)),
-      selfHand = selfPlayer.flatMap(_.currentHand()).map(HandDTO(_))
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/dto/WonInfoDTO.scala
+++ b/knockoutwhistweb/app/dto/WonInfoDTO.scala
@@ -1,34 +0,0 @@
-package dto
-
-import dto.subDTO.PodiumPlayerDTO
-import logic.game.GameLobby
-import model.users.User
-
-case class WonInfoDTO(
-                     gameId: String,
-                     winner: Option[PodiumPlayerDTO],
-                     allPlayers: Seq[PodiumPlayerDTO]
-                     )
-
-object WonInfoDTO {
-
-  def apply(lobby: GameLobby, user: User): WonInfoDTO = {
-    val matchImpl = lobby.logic.getCurrentMatch
-    if (matchImpl.isEmpty) {
-      throw new IllegalStateException("No current match available in game logic")
-    }
-    val allPlayersDTO: Seq[PodiumPlayerDTO] = matchImpl.get.totalplayers.map { player =>
-      PodiumPlayerDTO(lobby.logic, player)
-    }
-
-    val selfPlayerDTO = lobby.getPlayerByUser(user)
-    val winnerDTO = lobby.logic.getWinner
-
-    WonInfoDTO(
-      gameId = lobby.id,
-      winner = winnerDTO.map(player => PodiumPlayerDTO(lobby.logic, player)),
-      allPlayers = allPlayersDTO
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/dto/subDTO/CardDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/CardDTO.scala
@@ -1,31 +0,0 @@
-package dto.subDTO
-
-import de.knockoutwhist.cards.Card
-import util.WebUIUtils
-
-case class CardDTO(identifier: String, path: String, idx: Option[Int]) {
-  
-  def toCard: Card = {
-    WebUIUtils.stringToCard(identifier)
-  }
-  
-}
-
-object CardDTO {
-  
-  def apply(card: Card, index: Int): CardDTO = {
-    CardDTO(
-      identifier = WebUIUtils.cardtoString(card),
-      path = WebUIUtils.cardToPath(card),
-      idx = Some(index)
-    )
-  }
-
-  def apply(card: Card): CardDTO = {
-    CardDTO(
-      identifier = WebUIUtils.cardtoString(card),
-      path = WebUIUtils.cardToPath(card),
-      idx = None
-    )
-  }
-}
--- a/knockoutwhistweb/app/dto/subDTO/HandDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/HandDTO.scala
@@ -1,15 +0,0 @@
-package dto.subDTO
-
-import de.knockoutwhist.cards.Hand
-
-case class HandDTO(cards: List[CardDTO])
-
-object HandDTO {
-  
-  def apply(hand: Hand): HandDTO = {
-    HandDTO(
-      cards = hand.cards.zipWithIndex.map { case (card, idx) => CardDTO(card, idx) }
-    )
-  }
-  
-}
--- a/knockoutwhistweb/app/dto/subDTO/PlayerDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/PlayerDTO.scala
@@ -1,17 +0,0 @@
-package dto.subDTO
-
-import de.knockoutwhist.player.AbstractPlayer
-
-case class PlayerDTO(id: String, name: String, dogLife: Boolean) 
-
-object PlayerDTO {
-  
-  def apply(player: AbstractPlayer): PlayerDTO = {
-    PlayerDTO(
-      id = player.id.toString,
-      name = player.name,
-      dogLife = player.isInDogLife
-    )
-  }
-  
-}
--- a/knockoutwhistweb/app/dto/subDTO/PlayerQueueDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/PlayerQueueDTO.scala
@@ -1,19 +0,0 @@
-package dto.subDTO
-
-import de.knockoutwhist.control.GameLogic
-
-case class PlayerQueueDTO(currentPlayer: Option[PlayerDTO], queue: Seq[PlayerDTO])
-
-object PlayerQueueDTO {
-
-  def apply(logic: GameLogic): PlayerQueueDTO = {
-    val currentPlayerDTO = logic.getCurrentPlayer.map(PlayerDTO(_))
-    val queueDTO = logic.getPlayerQueue.map(_.duplicate().flatMap(player => Some(PlayerDTO(player))).toSeq)
-    if (queueDTO.isEmpty) {
-      PlayerQueueDTO(currentPlayerDTO, Seq.empty)
-    } else {
-      PlayerQueueDTO(currentPlayerDTO, queueDTO.get)
-    }
-  }
-
-}
--- a/knockoutwhistweb/app/dto/subDTO/PodiumPlayerDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/PodiumPlayerDTO.scala
@@ -1,47 +0,0 @@
-package dto.subDTO
-
-import de.knockoutwhist.control.GameLogic
-import de.knockoutwhist.player.AbstractPlayer
-import de.knockoutwhist.rounds.Match
-
-case class PodiumPlayerDTO(
-                          player: PlayerDTO,
-                          position: Int,
-                          roundsWon: Int,
-                          tricksWon: Int
-                          )
-
-object PodiumPlayerDTO {
-
-  def apply(gameLogic: GameLogic, player: AbstractPlayer): PodiumPlayerDTO = {
-    val matchImplOpt = gameLogic.getCurrentMatch
-    if (matchImplOpt.isEmpty) {
-      throw new IllegalStateException("No current match available in game logic")
-    }
-    val matchImpl: Match = matchImplOpt.get
-    var roundsWon = 0
-    var tricksWon = 0
-    for (round <- matchImpl.roundlist) {
-      if (round.winner.contains(player)) {
-        roundsWon += 1
-      }
-      for (trick <- round.tricklist) {
-        if (trick.winner.contains(player)) {
-          tricksWon += 1
-        }
-      }
-    }
-
-    PodiumPlayerDTO(
-      player = PlayerDTO(player),
-      position = if (gameLogic.getWinner.contains(player)) {
-        1
-      } else {
-        2
-      },
-      roundsWon = roundsWon,
-      tricksWon = tricksWon
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/dto/subDTO/RoundDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/RoundDTO.scala
@@ -1,20 +0,0 @@
-package dto.subDTO
-
-import de.knockoutwhist.cards.Card
-import de.knockoutwhist.cards.CardValue.Ace
-import de.knockoutwhist.rounds.{Match, Round}
-
-case class RoundDTO(trumpSuit: CardDTO, playersIn: Seq[PlayerDTO], firstRound: Boolean, trickList: List[TrickDTO])
-
-object RoundDTO {
-
-  def apply(round: Round, matchImpl: Option[Match]): RoundDTO = {
-    RoundDTO(
-      trumpSuit = CardDTO(Card(Ace, round.trumpSuit)),
-      playersIn = matchImpl.map(_.playersIn.map(PlayerDTO(_))).getOrElse(Seq.empty),
-      firstRound = round.firstRound,
-      trickList = round.tricklist.map(trick => TrickDTO(trick))
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/dto/subDTO/TrickDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/TrickDTO.scala
@@ -1,17 +0,0 @@
-package dto.subDTO
-
-import de.knockoutwhist.rounds.Trick
-
-case class TrickDTO(cards: Map[String, CardDTO], firstCard: Option[CardDTO], winner: Option[PlayerDTO])
-
-object TrickDTO {
-
-  def apply(trick: Trick): TrickDTO = {
-    TrickDTO(
-      cards = trick.cards.map { case (card, player) => player.name -> CardDTO(card) },
-      firstCard = trick.firstCard.map(card => CardDTO(card)),
-      winner = trick.winner.map(player => PlayerDTO(player))
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/dto/subDTO/UserDTO.scala
+++ b/knockoutwhistweb/app/dto/subDTO/UserDTO.scala
@@ -1,17 +0,0 @@
-package dto.subDTO
-
-import model.sessions.UserSession
-
-case class UserDTO(id: String, username: String, host: Boolean = false)
-
-object UserDTO {
-
-  def apply(user: UserSession): UserDTO = {
-    UserDTO(
-      id = user.id.toString,
-      username = user.name,
-      host = user.host
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/events/KickEvent.scala
+++ b/knockoutwhistweb/app/events/KickEvent.scala
@@ -1,9 +0,0 @@
-package events
-
-import model.users.User
-
-case class KickEvent(user: User) extends UserEvent(user) {
-  
-  override def id: String = "KickEvent"
-
-}
--- a/knockoutwhistweb/app/events/LeftEvent.scala
+++ b/knockoutwhistweb/app/events/LeftEvent.scala
@@ -1,9 +0,0 @@
-package events
-
-import model.users.User
-
-case class LeftEvent(user: User) extends UserEvent(user) {
-
-  override def id: String = "LeftEvent"
-  
-}
--- a/knockoutwhistweb/app/events/LobbyUpdateEvent.scala
+++ b/knockoutwhistweb/app/events/LobbyUpdateEvent.scala
@@ -1,9 +0,0 @@
-package events
-
-import de.knockoutwhist.utils.events.SimpleEvent
-
-case class LobbyUpdateEvent() extends SimpleEvent {
-
-  override def id: String = "LobbyUpdateEvent"
-  
-}
--- a/knockoutwhistweb/app/events/UserEvent.scala
+++ b/knockoutwhistweb/app/events/UserEvent.scala
@@ -1,12 +0,0 @@
-package events
-
-import de.knockoutwhist.utils.events.SimpleEvent
-import model.users.User
-
-import java.util.UUID
-
-abstract class UserEvent(user: User) extends SimpleEvent {
-
-  def userId: UUID = user.id
-  
-}
--- a/knockoutwhistweb/app/logic/Gateway.scala
+++ b/knockoutwhistweb/app/logic/Gateway.scala
@@ -1,45 +0,0 @@
-package logic
-
-import de.knockoutwhist.data.Pod
-import de.knockoutwhist.data.redis.RedisManager
-import org.apache.pekko.actor.ActorSystem
-import org.redisson.config.Config
-import play.api.inject.ApplicationLifecycle
-
-import java.util.UUID
-import javax.inject.*
-import scala.concurrent.ExecutionContext
-import scala.jdk.CollectionConverters.*
-
-@Singleton
-class Gateway @Inject()(
-                         lifecycle: ApplicationLifecycle,
-                         actorSystem: ActorSystem
-                       )(implicit ec: ExecutionContext)  {
-
-  val redis: RedisManager = {
-    val config: Config = Config()
-    config.useSingleServer.setAddress("valkey://" + sys.env.getOrElse("VALKEY_HOST", "localhost") + ":" + sys.env.getOrElse("VALKEY_PORT", "6379"))
-    RedisManager(config)
-  }
-
-  redis.continuousSyncPod(() => {
-    createPod()
-  })
-
-  def syncPod(): Unit = {
-    redis.syncPod(createPod())
-  }
-
-  private def createPod(): Pod = {
-    Pod(
-      UUID.randomUUID().toString,
-      PodManager.podName,
-      PodManager.podIp,
-      9000,
-      PodManager.getAllGameIds().asJava,
-      PodManager.allBoundUsers().asJava
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/logic/PodManager.scala
+++ b/knockoutwhistweb/app/logic/PodManager.scala
@@ -11,22 +11,20 @@ import util.GameUtil
 import javax.inject.Singleton
 import scala.collection.mutable

-object PodManager {
+@Singleton
+class PodManager {

  val TTL: Long = System.currentTimeMillis() + 86400000L // 24 hours in milliseconds
  val podIp: String = System.getenv("POD_IP")
  val podName: String = System.getenv("POD_NAME")
  
  private val sessions: mutable.Map[String, GameLobby] = mutable.Map()
-  private val userSession: mutable.Map[User, String] = mutable.Map()
  private val injector: Injector = Guice.createInjector(KnockOutWebConfigurationModule())
  
-  private[logic] var redis: Option[Gateway] = None
-
  def createGame(
-                  host: User,
-                  name: String,
-                  maxPlayers: Int
+                host: User,
+                name: String,
+                maxPlayers: Int
                ): GameLobby = {
    val gameLobby = GameLobby(
      logic = BaseGameLogic(injector.getInstance(classOf[Configuration])),
@@ -37,8 +35,6 @@ object PodManager {
      host = host
    )
    sessions += (gameLobby.id -> gameLobby)
-    registerUserToGame(host, gameLobby.id)
-    redis.foreach(gateway => gateway.syncPod())
    gameLobby
  }

@@ -46,36 +42,8 @@ object PodManager {
    sessions.get(gameId)
  }
  
-  def registerUserToGame(user: User, gameId: String): Boolean = {
-    if (sessions.contains(gameId)) {
-      userSession += (user -> gameId)
-      redis.foreach(gateway => gateway.syncPod())
-      true
-    } else {
-      false
-    }
-  }
-
-  def unregisterUserFromGame(user: User): Unit = {
-    userSession.remove(user)
-    redis.foreach(gateway => gateway.redis.invalidateUser(user.id.toString))
-  }
-
-  def identifyGameOfUser(user: User): Option[GameLobby] = {
-    userSession.get(user) match {
-      case Some(gameId) => sessions.get(gameId)
-      case None => None
-    }
-  }
-
  private[logic] def removeGame(gameId: String): Unit = {
    sessions.remove(gameId)
-    redis.foreach(gateway => gateway.redis.invalidateGame(gameId))
-    // Also remove all user sessions associated with this game
-    userSession.filterInPlace((_, v) => v != gameId)
  }

-  private[logic] def getAllGameIds(): List[String] = sessions.keys.toList
-  private[logic] def allBoundUsers(): List[String] = userSession.keys.map(_.id.toString).toList
-
 }
--- a/knockoutwhistweb/app/logic/game/GameLobby.scala
+++ b/knockoutwhistweb/app/logic/game/GameLobby.scala
@@ -10,43 +10,35 @@ import de.knockoutwhist.player.Playertype.HUMAN
 import de.knockoutwhist.player.{AbstractPlayer, PlayerFactory}
 import de.knockoutwhist.rounds.{Match, Round, Trick}
 import de.knockoutwhist.utils.events.{EventListener, SimpleEvent}
-import events.{KickEvent, LeftEvent, LobbyUpdateEvent, UserEvent}
 import exceptions.*
-import logic.PodManager
 import model.sessions.{InteractionType, UserSession}
 import model.users.User
-import play.api.libs.json.{JsObject, Json}

-import java.util.{Timer, TimerTask, UUID}
+import java.util.UUID
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
-import scala.util.Try

 class GameLobby private(
-                         val logic: GameLogic,
-                         val id: String,
-                         val internalId: UUID,
-                         val name: String,
-                         val maxPlayers: Int
-                       ) extends EventListener {
-
-
-  private val users: mutable.Map[UUID, UserSession] = mutable.Map()
+                 val logic: GameLogic,
+                 val id: String,
+                 val internalId: UUID,
+                 val name: String,
+                 val maxPlayers: Int
+               ) extends EventListener {
  logic.addListener(this)
  logic.createSession()

+  private val users: mutable.Map[UUID, UserSession] = mutable.Map()
+  
  def addUser(user: User): UserSession = {
    if (users.size >= maxPlayers) throw new GameFullException("The game is full!")
    if (users.contains(user.id)) throw new IllegalArgumentException("User is already in the game!")
    if (logic.getCurrentState != Lobby) throw new IllegalStateException("The game has already started!")
    val userSession = new UserSession(
      user = user,
-      host = false,
-      gameLobby = this
+      host = false
    )
    users += (user.id -> userSession)
-    PodManager.registerUserToGame(user, id)
-    logic.invoke(LobbyUpdateEvent())
    userSession
  }

@@ -54,13 +46,13 @@ class GameLobby private(
    event match {
      case event: PlayerEvent =>
        users.get(event.playerId).foreach(session => session.updatePlayer(event))
-      case event: UserEvent =>
-        users.get(event.userId).foreach(session => session.updatePlayer(event))
      case event: GameStateChangeEvent =>
        if (event.oldState == MainMenu && event.newState == Lobby) {
          return
        }
        users.values.foreach(session => session.updatePlayer(event))
+      case event: SessionClosed =>
+        users.values.foreach(session => session.updatePlayer(event))
      case event: SimpleEvent =>
        users.values.foreach(session => session.updatePlayer(event))
    }
@@ -68,7 +60,6 @@ class GameLobby private(

  /**
   * Start the game if the user is the host.
-   *
   * @param user the user who wants to start the game.
   */
  def startGame(user: User): Unit = {
@@ -95,39 +86,20 @@ class GameLobby private(

  /**
   * Remove the user from the game lobby.
-   *
   * @param user the user who wants to leave the game.
-   * @param kicked whether the user was kicked or left voluntarily.
   */
-  def leaveGame(userId: UUID, kicked: Boolean): Unit = {
+  def leaveGame(userId: UUID): Unit = {
    val sessionOpt = users.get(userId)
    if (sessionOpt.isEmpty) {
      throw new NotInThisGameException("You are not in this game!")
    }
-    if (sessionOpt.get.host) {
-      logic.invoke(SessionClosed())
-      for (session <- users.values) {
-        PodManager.unregisterUserFromGame(session.user)
-      }
-      users.clear()
-      PodManager.removeGame(id)
-      return
-    }
-    if (kicked) {
-      logic.invoke(KickEvent(sessionOpt.get.user))
-    } else {
-      logic.invoke(LeftEvent(sessionOpt.get.user))
-    }
    users.remove(userId)
-    PodManager.unregisterUserFromGame(sessionOpt.get.user)
-    logic.invoke(LobbyUpdateEvent())
  }

  /**
   * Play a card from the player's hand.
-   *
   * @param userSession the user session of the player.
-   * @param cardIndex   the index of the card in the player's hand.
+   * @param cardIndex the index of the card in the player's hand.
   */
  def playCard(userSession: UserSession, cardIndex: Int): Unit = {
    val player = getPlayerInteractable(userSession, InteractionType.Card)
@@ -143,6 +115,93 @@ class GameLobby private(
    logic.playerInputLogic.receivedCard(card)
  }

+  /**
+   * Play a card from the player's hand while in dog life or skip the round.
+   * @param userSession the user session of the player.
+   * @param cardIndex the index of the card in the player's hand or -1 if the player wants to skip the round.
+   */
+  def playDogCard(userSession: UserSession, cardIndex: Int): Unit = {
+    val player = getPlayerInteractable(userSession, InteractionType.DogCard)
+    if (!player.isInDogLife) {
+      throw new CantPlayCardException("You are not in dog life!")
+    }
+    if (cardIndex == -1) {
+      if (!MatchUtil.dogNeedsToPlay(getMatch, getRound)) {
+        throw new CantPlayCardException("You can't skip this round!")
+      }
+      logic.playerInputLogic.receivedDog(None)
+    }
+    val hand = getHand(player)
+    val card = hand.cards(cardIndex)
+    userSession.resetCanInteract()
+    logic.playerInputLogic.receivedDog(Some(card))
+  }
+
+  /**
+   * Select the trump suit for the round.
+   * @param userSession the user session of the player.
+   * @param trumpIndex the index of the trump suit.
+   */
+  def selectTrump(userSession: UserSession, trumpIndex: Int): Unit = {
+    val player = getPlayerInteractable(userSession, InteractionType.TrumpSuit)
+    val trumpSuits = Suit.values.toList
+    val selectedTrump = trumpSuits(trumpIndex)
+    userSession.resetCanInteract()
+    logic.playerInputLogic.receivedTrumpSuit(selectedTrump)
+  }
+
+  /**
+   * 
+   * @param userSession
+   * @param tieNumber
+   */
+  def selectTie(userSession: UserSession, tieNumber: Int): Unit = {
+    val player = getPlayerInteractable(userSession, InteractionType.TieChoice)
+    userSession.resetCanInteract()
+    logic.playerTieLogic.receivedTieBreakerCard(tieNumber)
+  }
+
+  
+  //-------------------
+  
+  def getUserSession(userId: UUID): UserSession = {
+    val sessionOpt = users.get(userId)
+    if (sessionOpt.isEmpty) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    sessionOpt.get
+  }
+
+  def getPlayerByUser(user: User): AbstractPlayer = {
+    getPlayerBySession(getUserSession(user.id))
+  }
+
+  def getPlayers: mutable.Map[UUID, UserSession] = {
+    users.clone()
+  }
+
+  def getLogic: GameLogic = {
+    logic
+  }
+
+  private def getPlayerBySession(userSession: UserSession): AbstractPlayer = {
+    val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
+    if (playerOption.isEmpty) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    playerOption.get
+  }
+  
+  private def getPlayerInteractable(userSession: UserSession, iType: InteractionType): AbstractPlayer = {
+    if (!userSession.lock.isHeldByCurrentThread) {
+      throw new IllegalStateException("The user session is not locked!")
+    }
+    if (userSession.canInteract.isEmpty || userSession.canInteract.get != iType) {
+      throw new NotInteractableException("You can't play a card!")
+    }
+    getPlayerBySession(userSession)
+  }
+  
  private def getHand(player: AbstractPlayer): Hand = {
    val handOption = player.currentHand()
    if (handOption.isEmpty) {
@@ -151,6 +210,14 @@ class GameLobby private(
    handOption.get
  }
  
+  private def getMatch: Match = {
+    val matchOpt = logic.getCurrentMatch
+    if (matchOpt.isEmpty) {
+      throw new IllegalStateException("No match is currently running!")
+    }
+    matchOpt.get
+  }
+
  private def getRound: Round = {
    val roundOpt = logic.getCurrentRound
    if (roundOpt.isEmpty) {
@@ -167,158 +234,6 @@ class GameLobby private(
    trickOpt.get
  }
  
-  /**
-   * Play a card from the player's hand while in dog life or skip the round.
-   *
-   * @param userSession the user session of the player.
-   * @param cardIndex   the index of the card in the player's hand or -1 if the player wants to skip the round.
-   */
-  def playDogCard(userSession: UserSession, cardIndex: Int): Unit = {
-    val player = getPlayerInteractable(userSession, InteractionType.DogCard)
-    if (!player.isInDogLife) {
-      throw new CantPlayCardException("You are not in dog life!")
-    }
-    if (cardIndex == -1) {
-      if (MatchUtil.dogNeedsToPlay(getMatch, getRound)) {
-        throw new CantPlayCardException("You can't skip this round!")
-      }
-      logic.playerInputLogic.receivedDog(None)
-      return
-    }
-    val hand = getHand(player)
-    val card = hand.cards(cardIndex)
-    userSession.resetCanInteract()
-    logic.playerInputLogic.receivedDog(Some(card))
-  }
-
-  /**
-   * Select the trump suit for the round.
-   *
-   * @param userSession the user session of the player.
-   * @param trumpIndex  the index of the trump suit.
-   */
-  def selectTrump(userSession: UserSession, trumpIndex: Int): Unit = {
-    val player = getPlayerInteractable(userSession, InteractionType.TrumpSuit)
-    val trumpSuits = Suit.values.toList
-    val selectedTrump = trumpSuits(trumpIndex)
-    userSession.resetCanInteract()
-    logic.playerInputLogic.receivedTrumpSuit(selectedTrump)
-  }
-
-
-  //-------------------
-
-  private def getPlayerInteractable(userSession: UserSession, iType: InteractionType): AbstractPlayer = {
-    if (!userSession.lock.isHeldByCurrentThread) {
-      throw new IllegalStateException("The user session is not locked!")
-    }
-    if (userSession.canInteract.isEmpty || userSession.canInteract.get != iType) {
-      throw new NotInteractableException("You can't play a card!")
-    }
-    getPlayerBySession(userSession)
-  }
-
-  /**
-   *
-   * @param userSession
-   * @param tieNumber
-   */
-  def selectTie(userSession: UserSession, tieNumber: Int): Unit = {
-    val player = getPlayerInteractable(userSession, InteractionType.TieChoice)
-    userSession.resetCanInteract()
-    logic.playerTieLogic.receivedTieBreakerCard(tieNumber)
-  }
-
-  def returnToLobby(userSession: UserSession): Unit = {
-    if (!users.contains(userSession.id)) {
-      throw new NotInThisGameException("You are not in this game!")
-    }
-    val session = users(userSession.id)
-    if (session != userSession) {
-      throw new IllegalArgumentException("User session does not match!")
-    }
-    if (!session.host)
-      throw new NotHostException("Only the host can return to the lobby!")
-    logic.createSession()
-  }
-
-  def getPlayerByUser(user: User): AbstractPlayer = {
-    getPlayerBySession(getUserSession(user.id))
-  }
-
-  def getUserSession(userId: UUID): UserSession = {
-    val sessionOpt = users.get(userId)
-    if (sessionOpt.isEmpty) {
-      throw new NotInThisGameException("You are not in this game!")
-    }
-    sessionOpt.get
-  }
-
-  private def getPlayerBySession(userSession: UserSession): AbstractPlayer = {
-    val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
-    if (playerOption.isEmpty) {
-      throw new NotInThisGameException("You are not in this game!")
-    }
-    playerOption.get
-  }
-
-  private def getMatch: Match = {
-    val matchOpt = logic.getCurrentMatch
-    if (matchOpt.isEmpty) {
-      throw new IllegalStateException("No match is currently running!")
-    }
-    matchOpt.get
-  }
-
-  def getPlayers: mutable.Map[UUID, UserSession] = {
-    users.clone()
-  }
-
-  def getLogic: GameLogic = {
-    logic
-  }
-
-  def getUsers: Set[User] = {
-    users.values.map(d => d.user).toSet
-  }
-  def getFinalRanking: List[(String, (Int, Int))] = {
-    Try {
-      val match1 = getMatch
-      if (!match1.isOver) {
-        List.empty
-      } else {
-        val winnerName = logic.getWinner.get.name
-
-        val allPlayerNames = match1.totalplayers.map(_.name)
-        val roundlist = match1.roundlist
-
-        val playerMetrics: Map[String, (Int, Int)] = allPlayerNames.map { name =>
-          val roundsWon = roundlist.count { round =>
-            round.winner.exists(_.name == name)
-          }
-          val totalTricksWon = roundlist.flatMap(_.tricklist).count { trick =>
-            trick.winner.exists(_.name == name)
-          }
-          name -> (roundsWon, totalTricksWon)
-        }.toMap
-
-        val winnerMetrics = playerMetrics(winnerName)
-        val remainingPlayersMetrics = playerMetrics.view.filterKeys(_ != winnerName).toList
-
-        val sortedRemainingPlayers = remainingPlayersMetrics.sortBy { case (_, (rounds, tricks)) =>
-          (-rounds, -tricks)
-        }
-        (winnerName, winnerMetrics) :: sortedRemainingPlayers
-      }
-    }.getOrElse(List())
-  }
-
-  private def transmitToAll(event: JsObject): Unit = {
-    users.values.foreach(session => {
-      session.websocketActor.foreach(act => act.transmitJsonToClient(event))
-    })
-  }
-
 }

 object GameLobby {
@@ -339,8 +254,7 @@ object GameLobby {
    )
    lobby.users += (host.id -> new UserSession(
      user = host,
-      host = true,
-      gameLobby = lobby
+      host = true
    ))
    lobby
  }
--- a/knockoutwhistweb/app/logic/user/SessionManager.scala
+++ b/knockoutwhistweb/app/logic/user/SessionManager.scala
@@ -8,10 +8,7 @@ import model.users.User
 trait SessionManager {
  
  def createSession(user: User): String
-
-
  def getUserBySession(sessionId: String): Option[User]
-
  def invalidateSession(sessionId: String): Unit

 }
--- a/knockoutwhistweb/app/logic/user/UserManager.scala
+++ b/knockoutwhistweb/app/logic/user/UserManager.scala
@@ -8,13 +8,9 @@ import model.users.User
 trait UserManager {

  def addUser(name: String, password: String): Boolean
-
  def authenticate(name: String, password: String): Option[User]
-
  def userExists(name: String): Option[User]
-
  def userExistsById(id: Long): Option[User]
-
  def removeUser(name: String): Boolean

 }
--- a/knockoutwhistweb/app/logic/user/impl/BaseSessionManager.scala
+++ b/knockoutwhistweb/app/logic/user/impl/BaseSessionManager.scala
@@ -13,7 +13,6 @@ 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 {
@@ -45,21 +44,15 @@ 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 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
-      }
+      val decoded = verifier.verify(sessionId)
+      val user = userManager.userExistsById(decoded.getClaim("id").asLong())
+      user.foreach(u => cache.put(sessionId, u))
+      user
    }
  }

--- a/knockoutwhistweb/app/logic/user/impl/StubUserManager.scala
+++ b/knockoutwhistweb/app/logic/user/impl/StubUserManager.scala
@@ -22,12 +22,6 @@ class StubUserManager @Inject()(val config: Config) extends UserManager {
      id = java.util.UUID.fromString("223e4567-e89b-12d3-a456-426614174000"),
      name = "Leon",
      passwordHash = UserHash.hashPW("password123")
-    ),
-    "Jakob" -> User(
-      internalId = 2L,
-      id = java.util.UUID.fromString("323e4567-e89b-12d3-a456-426614174000"),
-      name = "Jakob",
-      passwordHash = UserHash.hashPW("password123")
    )
  )

--- a/knockoutwhistweb/app/model/sessions/PlayerSession.scala
+++ b/knockoutwhistweb/app/model/sessions/PlayerSession.scala
@@ -7,9 +7,7 @@ import java.util.UUID
 trait PlayerSession {
  
  def id: UUID
-
  def name: String
-
  def updatePlayer(event: SimpleEvent): Unit
  
 }
--- a/knockoutwhistweb/app/model/sessions/UserSession.scala
+++ b/knockoutwhistweb/app/model/sessions/UserSession.scala
@@ -2,18 +2,14 @@ package model.sessions

 import de.knockoutwhist.events.player.{RequestCardEvent, RequestTieChoiceEvent, RequestTrumpSuitEvent}
 import de.knockoutwhist.utils.events.SimpleEvent
-import logic.game.GameLobby
 import model.users.User
-import play.api.libs.json.{JsObject, JsValue}

 import java.util.UUID
-import java.util.concurrent.locks.ReentrantLock
-import scala.util.Try
+import java.util.concurrent.locks.{Lock, ReentrantLock}

-class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) extends PlayerSession {
-  val lock: ReentrantLock = ReentrantLock()
+class UserSession(user: User, val host: Boolean) extends PlayerSession {
  var canInteract: Option[InteractionType] = None
-  var websocketActor: Option[UserWebsocketActor] = None
+  val lock: ReentrantLock = ReentrantLock()

  override def updatePlayer(event: SimpleEvent): Unit = {
    event match {
@@ -26,8 +22,6 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
        else canInteract = Some(InteractionType.Card)
      case _ =>
    }
-    websocketActor.foreach(_.solveRequests())
-    websocketActor.foreach(_.transmitEventToClient(event))
  }

  override def id: UUID = user.id
@@ -38,47 +32,4 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
    canInteract = None
  }
  
-  def handleWebResponse(eventType: String, data: JsObject): Unit = {
-    eventType match {
-      case "ping" =>
-        // No action needed for Ping
-        ()
-      case "StartGame" =>
-        gameLobby.startGame(user)
-      case "PlayCard" =>
-        val maybeCardIndex: Option[Int] = (data \ "cardindex").asOpt[Int]
-        maybeCardIndex match {
-          case Some(index) =>
-            val session = gameLobby.getUserSession(user.id)
-            gameLobby.playCard(session, index)
-          case None =>
-            println("Card Index not found or is not a number." + data)
-        }
-      case "PickTrumpsuit" =>
-        val maybeSuitIndex: Option[Int] = (data \ "suitIndex").asOpt[Int]
-        maybeSuitIndex match {
-          case Some(index) =>
-            val session = gameLobby.getUserSession(user.id)
-            gameLobby.selectTrump(session, index)
-          case None =>
-            println("Card Index not found or is not a number.")
-        }
-      case "KickPlayer" =>
-        val maybePlayerId: Option[String] = (data \ "playerId").asOpt[String]
-        maybePlayerId match {
-          case Some(id) =>
-            val playerUUID = UUID.fromString(id)
-            gameLobby.leaveGame(playerUUID, true)
-          case None =>
-            println("Player ID not found or is not a valid UUID.")
-        }
-      case "ReturnToLobby" =>
-        gameLobby.returnToLobby(this)
-      case "LeaveGame" =>
-        gameLobby.leaveGame(user.id, false)
-      case _ =>
-        println("Unknown event type: " + eventType + " with data: " + data)
-    }
-  }
-
 }
--- a/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala
+++ b/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala
@@ -1,133 +0,0 @@
-package model.sessions
-
-import de.knockoutwhist.utils.events.SimpleEvent
-import org.apache.pekko.actor.{Actor, ActorRef}
-import play.api.libs.json.{JsObject, JsValue, Json}
-import util.WebsocketEventMapper
-
-import scala.collection.mutable
-import scala.util.{Failure, Success, Try}
-
-class UserWebsocketActor(
-                          out: ActorRef,
-                          session: UserSession
-                        ) extends Actor {
-
-  private val requests: mutable.Map[String, String] = mutable.Map()
-
-  {
-    session.lock.lock()
-    if (session.websocketActor.isDefined) {
-      val otherWebsocket = session.websocketActor.get
-      otherWebsocket.transmitTextToClient("Error: Multiple websocket connections detected. Closing your connection.")
-      context.stop(otherWebsocket.self)
-      transmitTextToClient("Previous websocket connection closed. You are now connected.")
-    }
-    session.websocketActor = Some(this)
-    session.lock.unlock()
-  }
-
-
-  override def receive: Receive = {
-    case msg: String =>
-      val jsonObject = Try {
-        Json.parse(msg)
-      }
-      Try {
-        jsonObject match {
-          case Success(value) =>
-            handle(value)
-          case Failure(exception) =>
-            transmitTextToClient(s"Error parsing JSON: ${exception.getMessage}")
-        }
-      }.failed.foreach(
-        ex => transmitTextToClient(s"Error handling message: ${ex.getMessage}")
-      )
-    case other =>
-  }
-
-  private def transmitTextToClient(text: String): Unit = {
-    out ! text
-  }
-
-  private def handle(json: JsValue): Unit = {
-    session.lock.lock()
-    val idOpt = (json \ "id").asOpt[String]
-    if (idOpt.isEmpty) {
-      transmitJsonToClient(Json.obj(
-        "status" -> "error",
-        "error" -> "Missing 'id' field"
-      ))
-      session.lock.unlock()
-      return
-    }
-    val id = idOpt.get
-    val eventOpt = (json \ "event").asOpt[String]
-    if (eventOpt.isEmpty) {
-      transmitJsonToClient(Json.obj(
-        "id" -> id,
-        "event" -> null,
-        "status" -> "error",
-        "error" -> "Missing 'event' field"
-      ))
-      session.lock.unlock()
-      return
-    }
-    val statusOpt = (json \ "status").asOpt[String]
-    if (statusOpt.isDefined) {
-      session.lock.unlock()
-      return
-    }
-    val event = eventOpt.get
-    val data = (json \ "data").asOpt[JsObject].getOrElse(Json.obj())
-    requests += (id -> event)
-    val result = Try {
-      session.handleWebResponse(event, data)
-    }
-    if (!requests.contains(id)) {
-      session.lock.unlock()
-      return
-    }
-    requests -= id
-    if (result.isSuccess) {
-      transmitJsonToClient(Json.obj(
-        "id" -> id,
-        "event" -> event,
-        "status" -> "success"
-      ))
-    } else {
-      transmitJsonToClient(Json.obj(
-        "id" -> id,
-        "event" -> event,
-        "status" -> "error",
-        "error" -> result.failed.get.getMessage
-      ))
-    }
-    session.lock.unlock()
-  }
-
-  def transmitJsonToClient(jsonObj: JsValue): Unit = {
-    transmitTextToClient(jsonObj.toString())
-  }
-
-  def transmitEventToClient(event: SimpleEvent): Unit = {
-    transmitJsonToClient(WebsocketEventMapper.toJson(event, session))
-  }
-
-  def solveRequests(): Unit = {
-    if (!session.lock.isHeldByCurrentThread)
-      return;
-    if (requests.isEmpty)
-      return;
-    val pendingRequests = requests.toMap
-    requests.clear()
-    pendingRequests.foreach { case (id, event) =>
-      transmitJsonToClient(Json.obj(
-        "id" -> id,
-        "event" -> event,
-        "status" -> "success"
-      ))
-    }
-  }
-
-}
--- a/knockoutwhistweb/app/model/users/User.scala
+++ b/knockoutwhistweb/app/model/users/User.scala
@@ -1,13 +1,12 @@
 package model.users

-
 import java.util.UUID

 case class User(
-                 internalId: Long,
-                 id: UUID,
-                 name: String,
-                 passwordHash: String
+               internalId: Long,
+               id: UUID,
+               name: String,
+               passwordHash: String
               ) {

  def withName(newName: String): User = {
@@ -17,4 +16,5 @@ case class User(
  private def withPasswordHash(newPasswordHash: String): User = {
    this.copy(passwordHash = newPasswordHash)
  }
+
 }
--- a/knockoutwhistweb/app/modules/GatewayModule.scala
+++ b/knockoutwhistweb/app/modules/GatewayModule.scala
@@ -1,9 +0,0 @@
-package modules
-
-import com.google.inject.AbstractModule
-
-class GatewayModule extends AbstractModule {
-  override def configure(): Unit = {
-    bind(classOf[GatewayModule]).asEagerSingleton()
-  }
-}
--- a/knockoutwhistweb/app/services/JwtKeyProvider.scala
+++ b/knockoutwhistweb/app/services/JwtKeyProvider.scala
@@ -12,28 +12,10 @@ import javax.inject.*
@Singleton
 class JwtKeyProvider @Inject()(config: Configuration) {

-  val publicKey: RSAPublicKey = {
-    val pemOpt = config.getOptional[String]("auth.publicKeyPem")
-    val fileOpt = config.getOptional[String]("auth.publicKeyFile")
-
-    pemOpt.orElse(fileOpt.map { path =>
-      new String(Files.readAllBytes(Paths.get(path)))
-    }) match {
-      case Some(pem) => loadPublicKeyFromPem(pem)
-      case None => throw new RuntimeException("No RSA public key configured.")
-    }
-  }
-  val privateKey: RSAPrivateKey = {
-    val pemOpt = config.getOptional[String]("auth.privateKeyPem")
-    val fileOpt = config.getOptional[String]("auth.privateKeyFile")
-
-    pemOpt.orElse(fileOpt.map { path =>
-      new String(Files.readAllBytes(Paths.get(path)))
-    }) match {
-      case Some(pem) => loadPrivateKeyFromPem(pem)
-      case None => throw new RuntimeException("No RSA private key configured.")
-    }
-  }
+  private def cleanPem(pem: String): String =
+    pem.replaceAll("-----BEGIN (.*)-----", "")
+      .replaceAll("-----END (.*)-----", "")
+      .replaceAll("\\s", "")

  private def loadPublicKeyFromPem(pem: String): RSAPublicKey = {
    val decoded = Base64.getDecoder.decode(cleanPem(pem))
@@ -47,9 +29,28 @@ class JwtKeyProvider @Inject()(config: Configuration) {
    KeyFactory.getInstance("RSA").generatePrivate(spec).asInstanceOf[RSAPrivateKey]
  }

-  private def cleanPem(pem: String): String =
-    pem.replaceAll("-----BEGIN (.*)-----", "")
-      .replaceAll("-----END (.*)-----", "")
-      .replaceAll("\\s", "")
+  val publicKey: RSAPublicKey = {
+    val pemOpt = config.getOptional[String]("auth.publicKeyPem")
+    val fileOpt = config.getOptional[String]("auth.publicKeyFile")
+
+    pemOpt.orElse(fileOpt.map { path =>
+      new String(Files.readAllBytes(Paths.get(path)))
+    }) match {
+      case Some(pem) => loadPublicKeyFromPem(pem)
+      case None => throw new RuntimeException("No RSA public key configured.")
+    }
+  }
+
+  val privateKey: RSAPrivateKey = {
+    val pemOpt = config.getOptional[String]("auth.privateKeyPem")
+    val fileOpt = config.getOptional[String]("auth.privateKeyFile")
+
+    pemOpt.orElse(fileOpt.map { path =>
+      new String(Files.readAllBytes(Paths.get(path)))
+    }) match {
+      case Some(pem) => loadPrivateKeyFromPem(pem)
+      case None => throw new RuntimeException("No RSA private key configured.")
+    }
+  }
  
 }
--- a/knockoutwhistweb/app/util/GameUtil.scala
+++ b/knockoutwhistweb/app/util/GameUtil.scala
@@ -1,8 +1,5 @@
 package util

-import de.knockoutwhist.control.GameState
-import de.knockoutwhist.control.GameState.{FinishedMatch, InGame, Lobby, MainMenu, SelectTrump, TieBreak}
-
 import scala.util.Random

 object GameUtil {
@@ -29,15 +26,4 @@ object GameUtil {
    code.toString()
  }
  
-  def stateToTitle(gameState: GameState): String = {
-    gameState match {
-      case Lobby => "Lobby"
-      case MainMenu => "Main Menu"
-      case InGame => "In Game"
-      case SelectTrump => "Select Trump"
-      case TieBreak => "Tie Break"
-      case FinishedMatch => "Finished Match"
-    }
-  }
-
 }
--- a/knockoutwhistweb/app/util/WebUIUtils.scala
+++ b/knockoutwhistweb/app/util/WebUIUtils.scala
@@ -1,22 +1,13 @@
 package util

+import de.knockoutwhist.cards.Card
 import de.knockoutwhist.cards.CardValue.*
 import de.knockoutwhist.cards.Suit.{Clubs, Diamonds, Hearts, Spades}
-import de.knockoutwhist.cards.{Card, Hand}
-import play.api.libs.json.{JsArray, Json}
 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"
-  }
-
-  def cardtoString(card: Card): String = {
    val s = card.suit match {
      case Spades => "S"
      case Hearts => "H"
@@ -38,50 +29,6 @@ object WebUIUtils {
      case Three => "3"
      case Two => "2"
    }
-    f"$cv$s"
+    views.html.render.card.apply(f"images/cards/$cv$s.png")(card.toString)
  }
-  
-  def stringToCard(cardStr: String): Card = {
-    val cv = cardStr.charAt(0) match {
-      case 'A' => Ace
-      case 'K' => King
-      case 'Q' => Queen
-      case 'J' => Jack
-      case 'T' => Ten
-      case '9' => Nine
-      case '8' => Eight
-      case '7' => Seven
-      case '6' => Six
-      case '5' => Five
-      case '4' => Four
-      case '3' => Three
-      case '2' => Two
-    }
-    val s = cardStr.charAt(1) match {
-      case 'S' => Spades
-      case 'H' => Hearts
-      case 'C' => Clubs
-      case 'D' => Diamonds
-    }
-    Card(cv, s)
-  }
-
-  /**
-   * Map a Hand to a JsArray of cards
-   * Per card it has the string and the index in the hand
-   * @param hand
-   * @return
-   */
-  def handToJson(hand: Hand): JsArray = {
-    val cards = hand.cards
-    JsArray(
-      cards.zipWithIndex.map { case (card, index) =>
-        Json.obj(
-          "idx" -> index,
-          "card" -> cardtoString(card)
-        )
-      }
-    )
-  }
-
 }
--- a/knockoutwhistweb/app/util/WebsocketEventMapper.scala
+++ b/knockoutwhistweb/app/util/WebsocketEventMapper.scala
@@ -1,77 +0,0 @@
-package util
-
-import de.knockoutwhist.control.GameState
-import de.knockoutwhist.control.GameState.{FinishedMatch, InGame, Lobby, SelectTrump, TieBreak}
-import de.knockoutwhist.utils.events.SimpleEvent
-import dto.subDTO.{CardDTO, HandDTO, PlayerDTO, PlayerQueueDTO, PodiumPlayerDTO, RoundDTO, TrickDTO, UserDTO}
-import dto.{GameInfoDTO, LobbyInfoDTO, TieInfoDTO, TrumpInfoDTO, WonInfoDTO}
-import model.sessions.UserSession
-import play.api.libs.json.{JsValue, Json, OFormat}
-import tools.jackson.databind.json.JsonMapper
-import tools.jackson.module.scala.ScalaModule
-import util.mapper.*
-
-object WebsocketEventMapper {
-
-  implicit val cardFormat: OFormat[CardDTO] = Json.format[CardDTO]
-  implicit val handFormat: OFormat[HandDTO] = Json.format[HandDTO]
-  implicit val playerFormat: OFormat[PlayerDTO] = Json.format[PlayerDTO]
-  implicit val queueFormat: OFormat[PlayerQueueDTO] = Json.format[PlayerQueueDTO]
-  implicit val podiumPlayerFormat: OFormat[PodiumPlayerDTO] = Json.format[PodiumPlayerDTO]
-  implicit val roundFormat: OFormat[RoundDTO] = Json.format[RoundDTO]
-  implicit val trickFormat: OFormat[TrickDTO] = Json.format[TrickDTO]
-  implicit val userFormat: OFormat[UserDTO] = Json.format[UserDTO]
-
-  implicit val gameInfoDTOFormat: OFormat[GameInfoDTO] = Json.format[GameInfoDTO]
-  implicit val lobbyFormat: OFormat[LobbyInfoDTO] = Json.format[LobbyInfoDTO]
-  implicit val tieInfoFormat: OFormat[TieInfoDTO] = Json.format[TieInfoDTO]
-  implicit val trumpInfoFormat: OFormat[TrumpInfoDTO] = Json.format[TrumpInfoDTO]
-  implicit val wonInfoDTOFormat: OFormat[WonInfoDTO] = Json.format[WonInfoDTO]
-  
-  private var specialMappers: Map[String,SimpleEventMapper[SimpleEvent]] = Map()
-
-  private def registerCustomMapper[T <: SimpleEvent](mapper: SimpleEventMapper[T]): Unit = {
-    specialMappers = specialMappers + (mapper.id -> mapper.asInstanceOf[SimpleEventMapper[SimpleEvent]])
-  }
-  
-  // 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 = {
-    val data: Option[JsValue] = if (specialMappers.contains(obj.id)) {
-      Some(specialMappers(obj.id).toJson(obj, session))
-    }else {
-      None
-    }
-    Json.obj(
-      "id" -> ("request-" + java.util.UUID.randomUUID().toString),
-      "event" -> obj.id,
-      "state" -> session.gameLobby.getLogic.getCurrentState.toString,
-      "stateData" -> stateToJson(session),
-      "data" -> data
-    )
-  }
-
-  def stateToJson(session: UserSession): JsValue = {
-    session.gameLobby.getLogic.getCurrentState match {
-      case Lobby => Json.toJson(LobbyInfoDTO(session.gameLobby, session.user))
-      case InGame => Json.toJson(GameInfoDTO(session.gameLobby, session.user))
-      case SelectTrump => Json.toJson(TrumpInfoDTO(session.gameLobby, session.user))
-      case TieBreak => Json.toJson(TieInfoDTO(session.gameLobby, session.user))
-      case FinishedMatch => Json.toJson(WonInfoDTO(session.gameLobby, session.user))
-      case _ => Json.obj()
-    }
-  }
-
-}
--- a/knockoutwhistweb/app/util/mapper/CardPlayedEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/CardPlayedEventMapper.scala
@@ -1,20 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.global.CardPlayedEvent
-import model.sessions.UserSession
-import play.api.libs.json.{JsArray, JsObject, Json}
-import util.WebUIUtils
-
-object CardPlayedEventMapper extends SimpleEventMapper[CardPlayedEvent]{
-
-  override def id: String = "CardPlayedEvent"
-
-  override def toJson(event: CardPlayedEvent, session: UserSession): JsObject = {
-    Json.obj(
-      "firstCard" -> (if (event.trick.firstCard.isDefined) WebUIUtils.cardtoString(event.trick.firstCard.get) else "BLANK"),
-      "playedCards" -> JsArray(event.trick.cards.map { case (card, player) =>
-        Json.obj("cardId" -> WebUIUtils.cardtoString(card), "player" -> player.name)
-      }.toList)
-    )
-  }
-}
--- a/knockoutwhistweb/app/util/mapper/GameStateEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/GameStateEventMapper.scala
@@ -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
-    )
-  }
-}
--- a/knockoutwhistweb/app/util/mapper/KickEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/KickEventMapper.scala
@@ -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,
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/util/mapper/LeftEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/LeftEventMapper.scala
@@ -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
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/util/mapper/LobbyUpdateEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/LobbyUpdateEventMapper.scala
@@ -1,25 +0,0 @@
-package util.mapper
-
-import events.LobbyUpdateEvent
-import model.sessions.UserSession
-import play.api.libs.json.{JsArray, JsObject, Json}
-
-object LobbyUpdateEventMapper extends SimpleEventMapper[LobbyUpdateEvent] {
-
-  override def id: String = "LobbyUpdateEvent"
-
-  override def toJson(event: LobbyUpdateEvent, session: UserSession): JsObject = {
-    Json.obj(
-      "host" -> session.host,
-      "maxPlayers" -> session.gameLobby.maxPlayers,
-      "players" -> JsArray(session.gameLobby.getPlayers.values.map(player => {
-        Json.obj(
-          "id" -> player.id,
-          "name" -> player.name,
-          "self" -> (player.id == session.user.id)
-        )
-      }).toList)
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/util/mapper/NewRoundEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/NewRoundEventMapper.scala
@@ -1,18 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.global.NewRoundEvent
-import logic.game.GameLobby
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-
-object NewRoundEventMapper extends SimpleEventMapper[NewRoundEvent]{
-  override def id: String = "NewRoundEvent"
-
-  override def toJson(event: NewRoundEvent, session: UserSession): JsObject = {
-    val gameLobby = session.gameLobby
-    Json.obj(
-      "trumpsuit" -> gameLobby.getLogic.getCurrentRound.get.trumpSuit.toString,
-      "players" -> gameLobby.getLogic.getCurrentMatch.get.playersIn.map(player => player.toString)
-    )
-  }
-}
--- a/knockoutwhistweb/app/util/mapper/NewTrickEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/NewTrickEventMapper.scala
@@ -1,14 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.global.NewTrickEvent
-import logic.game.GameLobby
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-
-object NewTrickEventMapper extends SimpleEventMapper[NewTrickEvent]{
-  override def id: String = "NewTrickEvent"
-
-  override def toJson(event: NewTrickEvent, session: UserSession): JsObject = {
-    Json.obj()
-  }
-}
--- a/knockoutwhistweb/app/util/mapper/ReceivedHandEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/ReceivedHandEventMapper.scala
@@ -1,17 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.player.ReceivedHandEvent
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-import util.WebUIUtils
-
-object ReceivedHandEventMapper extends SimpleEventMapper[ReceivedHandEvent] {
-
-  override def id: String = "ReceivedHandEvent"
-  override def toJson(event: ReceivedHandEvent, session: UserSession): JsObject = {
-    Json.obj(
-      "dog" -> event.player.isInDogLife,
-      "hand" -> event.player.currentHand().map(hand => WebUIUtils.handToJson(hand))
-    )
-  }
-}
--- a/knockoutwhistweb/app/util/mapper/RequestCardEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/RequestCardEventMapper.scala
@@ -1,16 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.player.RequestCardEvent
-import logic.game.GameLobby
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-
-object RequestCardEventMapper extends SimpleEventMapper[RequestCardEvent]{
-  override def id: String = "RequestCardEvent"
-
-  override def toJson(event: RequestCardEvent, session: UserSession): JsObject = {
-    Json.obj(
-      "player" -> event.player.name
-    )
-  }
-}
--- a/knockoutwhistweb/app/util/mapper/RoundEndEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/RoundEndEventMapper.scala
@@ -1,20 +0,0 @@
-package util.mapper
-
-import controllers.routes
-import de.knockoutwhist.events.global.RoundEndEvent
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-
-object RoundEndEventMapper extends SimpleEventMapper[RoundEndEvent] {
-
-  override def id: String = "RoundEndEvent"
-
-  override def toJson(event: RoundEndEvent, session: UserSession): JsObject = {
-
-    Json.obj(
-      "player" -> event.winner.name,
-      "tricks" -> event.amountOfTricks
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/util/mapper/SessionClosedMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/SessionClosedMapper.scala
@@ -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,
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/util/mapper/SimpleEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/SimpleEventMapper.scala
@@ -1,13 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.utils.events.SimpleEvent
-import logic.game.GameLobby
-import model.sessions.UserSession
-import play.api.libs.json.JsObject
-
-trait SimpleEventMapper[T <: SimpleEvent] {
-  
-  def id: String
-  def toJson(event: T, session: UserSession): JsObject
-
-}
--- a/knockoutwhistweb/app/util/mapper/TrickEndEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/TrickEndEventMapper.scala
@@ -1,20 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.global.TrickEndEvent
-import de.knockoutwhist.rounds.Trick
-import logic.game.GameLobby
-import model.sessions.UserSession
-import play.api.libs.json.{JsObject, Json}
-
-object TrickEndEventMapper extends SimpleEventMapper[TrickEndEvent]{
-  override def id: String = "TrickEndEvent"
-
-  override def toJson(event: TrickEndEvent, session: UserSession): JsObject = {
-    val gameLobby = session.gameLobby
-    Json.obj(
-      "playerwon" -> event.winner.name,
-      "playersin" -> gameLobby.getLogic.getCurrentMatch.get.playersIn.map(player => player.name),
-      "tricklist" -> gameLobby.getLogic.getCurrentRound.get.tricklist.map(trick => trick.winner.map(player => player.name).getOrElse("Trick in Progress"))
-    )
-  }
-}
--- a/knockoutwhistweb/app/util/mapper/TurnEventMapper.scala
+++ b/knockoutwhistweb/app/util/mapper/TurnEventMapper.scala
@@ -1,35 +0,0 @@
-package util.mapper
-
-import de.knockoutwhist.events.global.TurnEvent
-import de.knockoutwhist.player.AbstractPlayer
-import model.sessions.UserSession
-import play.api.libs.json.{JsArray, JsObject, Json}
-
-object TurnEventMapper extends SimpleEventMapper[TurnEvent] {
-
-  override def id: String = "TurnEvent"
-
-  override def toJson(event: TurnEvent, session: UserSession): JsObject = {
-    val nextPlayers = if (session.gameLobby.logic.getPlayerQueue.isEmpty) {
-      Json.arr()
-    } else {
-      val queue = session.gameLobby.logic.getPlayerQueue.get
-      JsArray(
-        queue.duplicate().map(player => mapPlayer(player)).toList
-      )
-    }
-    
-    Json.obj(
-      "currentPlayer" -> mapPlayer(event.player),
-      "nextPlayers" -> nextPlayers
-    )
-  }
-
-  private def mapPlayer(player: AbstractPlayer): JsObject = {
-    Json.obj(
-      "name" -> player.name,
-      "dog" -> player.isInDogLife
-    )
-  }
-
-}
--- a/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
+++ b/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
@@ -1,108 +0,0 @@
-@(user: Option[model.users.User], gamelobby: logic.game.GameLobby)
-
-<div class="lobby-background vh-100 d-flex align-items-start justify-content-center pt-5">
-<div class="container py-5">
-        <div class="row justify-content-center">
-            <div class="col-lg-8 col-xl-6">
-                <div class="card shadow-lg mb-5 text-center bg-white border-0 rounded-4">
-                    <div class="card-body p-4 p-md-5">
-                        <h1 class="card-title display-5 fw-bold text-success mb-3">Match Over!</h1>
-                        <p class="fs-4 text-muted">Congratulations to the winner:</p>
-                        <h2 class="display-3 fw-bolder mb-4 text-primary">
-                            @gamelobby.getLogic.getWinner.get.name
-                        </h2>
-                    </div>
-                </div>
-
-                <div class="card shadow mb-5 border-0 rounded-4 overflow-hidden">
-                    <div class="card-header bg-dark text-white text-center fs-5 fw-semibold">
-                        Final Standings
-                    </div>
-                    <div class="d-flex justify-content-between align-items-center p-2 text-uppercase fw-bold border-bottom bg-light">
-                        <div class="d-flex align-items-center">
-                            Player
-                        </div>
-                        <div class="d-flex flex-row gap-3">
-                            <span class="fs-6 text-dark text-center" style="width: 5rem;">Rounds won</span>
-                            <span class="fs-6 text-dark text-center" style="width: 5rem;">Tricks won</span>
-                        </div>
-                    </div>
-                    <div>
-                    @gamelobby.getFinalRanking.zipWithIndex.map { case ((playerName, (wonRounds, tricksWon)), index) =>
-                        @defining(index + 1) { rank =>
-                            <div class="d-flex justify-content-between align-items-center p-3 border-bottom @if(rank == 1){bg-success-subtle fw-bold}">
-                                <div class="d-flex align-items-center">
-                                    <span class="badge @if(rank == 1){bg-warning text-dark fs-6} else {bg-secondary} rounded-pill me-3">#@rank</span>
-                                    @playerName
-                                </div>
-                                <div class="d-flex flex-row gap-3">
-                                    <span class="fs-6 text-muted text-center" style="width: 5rem;">@wonRounds</span>
-                                    <span class="fs-6 text-muted text-center" style="width: 5rem;">@tricksWon</span>
-                                </div>
-                            </div>
-                        }
-                    }
-                    </div>
-                    @if(gamelobby.getFinalRanking.isEmpty) {
-                        <div class="p-3 text-center text-muted">No final scores available.</div>
-                    }
-                </div>
-
-
-                @if(user.isDefined && gamelobby.getUserSession(user.get.id).host) {
-                    <div class="col-12 text-center mt-4">
-                        <div class="btn btn-success btn-lg shadow" onclick="handleReturnToLobby()">
-                            Return to Lobby
-                        </div>
-                    </div>
-                } else {
-                    <div class="col-12 text-center mt-4">
-                        <div class="text-primary">
-                            <div class="spinner-grow text-primary mt-1" role="status">
-                                <span class="visually-hidden">Loading...</span>
-                            </div>
-                            <p class="mt-3 fs-6 fw-semibold">
-                                Waiting for the Host to continue...
-                            </p>
-                        </div>
-                    </div>
-                }
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    function fireConfetti() {
-        let duration = 3 * 1000;
-        let animationEnd = Date.now() + duration;
-        let defaults = { startVelocity: 30, spread: 360, ticks: 60, zIndex: 0 };
-
-        function randomInRange(min, max) {
-            return Math.random() * (max - min) + min;
-        }
-
-        let interval = setInterval(function() {
-            let timeLeft = animationEnd - Date.now();
-
-            if (timeLeft <= 0) {
-                return clearInterval(interval);
-            }
-
-            let particleCount = 50 * (timeLeft / duration);
-
-            // Left burst
-            confetti(Object.assign({}, defaults, {
-                particleCount,
-                origin: { x: randomInRange(0.1, 0.3), y: Math.random() - 0.2 }
-            }));
-
-            // Right burst
-            confetti(Object.assign({}, defaults, {
-                particleCount,
-                origin: { x: randomInRange(0.7, 0.9), y: Math.random() - 0.2 }
-            }));
-        }, 250);
-    }
-    connectWebSocket();
-    fireConfetti();
-</script>
--- a/knockoutwhistweb/app/views/ingame/ingame.scala.html
+++ b/knockoutwhistweb/app/views/ingame/ingame.scala.html
@@ -1,42 +1,51 @@
-@import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.TrickUtil
-@import de.knockoutwhist.utils.Implicits.*
-
@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)

-<div class="lobby-background vh-100">
-    <main class="game-field-background vh-100 ingame-side-shadow">
-        <div class="py-5 container-xxl">
-
-            <div class="row ms-4 me-4">
-                <div class="col-4 mt-5 text-start" id="turn-component"></div>
-
-                <div class="col-4 text-center">
-
-
-
-                    <div id="score-table"></div>
-
-
-                    <div class="d-flex justify-content-center g-3 mb-5" id="trick-cards-container"></div>
-
-                </div>
-
-
-                <div class="col-4 mt-5 text-end" id="game-info-component"></div>
-
-
-            </div>
-
-            <div class="row justify-content-center g-2 mt-4 bottom-div" style="backdrop-filter: blur(4px);
-                margin-left: 0;
-                margin-right: 0;">
-                <div id="player-hand-container"></div>
-            </div>
+@main("Ingame") {
+<div class="container">
+    <div class="row">
+        <div class="col-4 mt-5 text-start">
+            <p class="fs-4">Next Player</p>
+            <p class="fs-4">@gamelobby.getLogic.getPlayerQueue.get.duplicate().nextPlayer()</p>
        </div>
-    </main>
+        <div class="col-4 mt-5 text-center">
+            <p class="fs-3">Cards played</p>
+        </div>
+        <div class="col-4 mt-5 text-end">
+            <p class="fs-4">Trumpsuit:</p>
+            <p class="fs-4">@gamelobby.getLogic.getCurrentRound.get.trumpSuit</p>
+            <p class="fs-4 mt-5">First Card:</p>
+            @if(gamelobby.getLogic.getCurrentTrick.get.firstCard.isDefined) {
+                @util.WebUIUtils.cardtoImage(gamelobby.getLogic.getCurrentTrick.get.firstCard.get) width="30%"/>
+            } else {
+                @views.html.render.card.apply("images/cards/1B.png")("Blank Card") width="30%"/>
+            }
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-6 mt-5">
+            @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) {
+                <div class="col-auto">
+                    <div class="card" style="max-width: 8rem;">
+                        @util.WebUIUtils.cardtoImage(cardplayed) />
+                        <div class="card-body">
+                            <h5 class="card-title">@player</h5>
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+    <div class="row gx-0">
+                @for(i <- 0 until player.currentHand().get.cards.size) {
+                    <div class="col-auto">
+                        <form action="@(routes.IngameController.playCard(gamelobby.id))" class="d-flex" method="post">
+                            <input type="hidden" name="cardId" value="@i" />
+                            <button type="submit" class="btn bg-transparent p-0 m-0">
+                                @util.WebUIUtils.cardtoImage(player.currentHand().get.cards(i)) width="40%" />
+                            </button>
+                        </form>
+                    </div>
+                }
+    </div>
 </div>
-<script>
-    connectWebSocket()
-    canPlayCard = @gamelobby.logic.getCurrentPlayer.contains(player);
-    globalThis.initGameVueComponents()
-</script>
+}
--- a/knockoutwhistweb/app/views/ingame/selecttrump.scala.html
+++ b/knockoutwhistweb/app/views/ingame/selecttrump.scala.html
@@ -1,68 +1,27 @@
-@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
+@(player: de.knockoutwhist.player.AbstractPlayer, logic: de.knockoutwhist.control.GameLogic)

+@main("Selecting Trumpsuit...") {
 <div id="selecttrumpsuit" class="game-field game-field-background">
-    <div class="ingame-stage blur-sides">
-        <div class="container py-4">
-            <div class="row justify-content-center">
-                <div class="col-12">
-                    <div class="card shadow-sm">
-                        <div class="card-header text-center">
-                            <h3 class="mb-0">Select Trump Suit</h3>
-                        </div>
-                        <div class="card-body">
-                            @if(gamelobby.logic.getCurrentMatch.isDefined) {
-                                @if(player.equals(gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get)) {
-                                    <div class="alert alert-info" role="alert" aria-live="polite">
-                                        You (@player.toString) won the last round. Choose the trump suit for the next round.
-                                    </div>
-
-                                    <div class="row justify-content-center col-auto mb-5">
-                                        <div class="col-auto handcard">
-                                            <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="0" style="border-radius: 6px" onclick="handleTrumpSelection(this)">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades))
-                                                width="120px" style="border-radius: 6px"/>
-                                            </div>
-                                        </div>
-                                        <div class="col-auto handcard">
-                                            <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="1" style="border-radius: 6px" onclick="handleTrumpSelection(this)">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts))
-                                                width="120px" style="border-radius: 6px"/>
-                                            </div>
-                                        </div>
-                                        <div class="col-auto handcard">
-                                            <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="2" style="border-radius: 6px" onclick="handleTrumpSelection(this)">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds))
-                                                width="120px" style="border-radius: 6px"/>
-                                            </div>
-                                        </div>
-                                        <div class="col-auto handcard">
-                                            <div class="btn btn-outline-light p-0 border-0 shadow-none" data-trump="3" style="border-radius: 6px" onclick="handleTrumpSelection(this)">
-                                                @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs))
-                                                width="120px" style="border-radius: 6px"/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="row justify-content-center ingame-cards-slide" id="card-slide">
-                                    @for(i <- player.currentHand().get.cards.indices) {
-                                        <div class="col-auto" style="border-radius: 6px">
-                                            @util.WebUIUtils.cardtoImage(player.currentHand().get.cards(i)) width="120px" style="border-radius: 6px"/>
-                                        </div>
-                                    }
-                                    </div>
-                                } else {
-                                    <div class="alert alert-warning" role="alert" aria-live="polite">
-                                        @gamelobby.logic.getCurrentMatch.get.roundlist.last.winner.get.name
-                                        is choosing a trumpsuit. The new round will start once a suit is picked.
-                                    </div>
-                                }
-                            }
-                        </div>
-                    </div>
-                </div>
-            </div>
+    @if(player.equals(logic.getCurrentMatch.get.roundlist.last.winner.get)) {
+        <h1>Knockout Whist</h1>
+        <p>You (@player.toString) have won the last round! Select a trumpsuit for the next round!</p>
+        <p>Available trumpsuits are displayed below:</p>
+        <div id="playercards">
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Spades))
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Clubs))
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Hearts))
+            @util.WebUIUtils.cardtoImage(de.knockoutwhist.cards.Card(de.knockoutwhist.cards.CardValue.Ace, de.knockoutwhist.cards.Suit.Diamonds))
        </div>
-    </div>
+        <p>Your cards</p>
+
+        <div id="playercards">
+            @for(card <- player.currentHand().get.cards) {
+            @util.WebUIUtils.cardtoImage(card)
+            }
+        </div>
+    } else {
+    <h1>Knockout Whist</h1>
+    <p>@player.toString is choosing a trumpsuit. Starting new round when @player.toString picked a trumpsuit...</p>
+    }
 </div>
-<script>
-    connectWebSocket()
-</script>
+}
--- a/knockoutwhistweb/app/views/ingame/tie.scala.html
+++ b/knockoutwhistweb/app/views/ingame/tie.scala.html
@@ -1,114 +1,27 @@
-@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
+@(player: de.knockoutwhist.player.AbstractPlayer, logic: de.knockoutwhist.control.GameLogic)
+
+@main("Tie") {
 <div id="tie" class="game-field game-field-background">
-    <div class="ingame-stage blur-sides">
-        <div class="container py-4">
-            <div class="row justify-content-center">
-                <div class="col-12 col-md-10 col-lg-8">
-                    <div class="card shadow-sm">
-                        <div class="card-header text-center">
-                            <h3 class="mb-0">Tie Break</h3>
-                        </div>
-                        <div class="card-body">
-                            <div class="mb-3">
-                                <p class="card-text">
-                                    The last round was tied between:
-                                    <span class="ms-1">
-                                        @for(players <- gamelobby.logic.playerTieLogic.getTiedPlayers) {
-                                            <span class="badge text-bg-secondary me-1">@players</span>
-                                        }
-                                    </span>
-                                </p>
-                            </div>
-
-                            @if(gamelobby.logic.playerTieLogic.currentTiePlayer().contains(player)) {
-                                @defining(gamelobby.logic.playerTieLogic.highestAllowedNumber()) { maxNum =>
-                                    <div class="alert alert-info" role="alert" aria-live="polite">
-                                        Pick a number between 1 and @{
-                                        maxNum + 1
-                                    }.
-                                    The resulting card will be your card for the cut.
-                                    </div>
-
-                                    <div class="row g-2 align-items-center">
-                                        <div class="col-auto">
-                                            <label for="tieNumber" class="col-form-label">Your number</label>
-                                        </div>
-                                        <div class="col-auto">
-                                            <input type="number" id="tieNumber" class="form-control" name="tie" min="1" max="@{
-                                                maxNum + 1
-                                            }" placeholder="1" required>
-                                        </div>
-                                        <div class="col-auto">
-                                            <button onclick="selectTie('@gamelobby.id')" class="btn btn-primary">
-                                                Confirm</button>
-                                        </div>
-                                    </div>
-                                    <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
-
-                                    <div id="cardsplayed" class="row g-3 justify-content-center">
-                                    @if(gamelobby.logic.playerTieLogic.getSelectedCard.nonEmpty) {
-                                        @for((player, card) <- gamelobby.logic.playerTieLogic.getSelectedCard) {
-                                            <div class="col-6">
-                                                <div class="card shadow-sm border-0 h-100 text-center">
-                                                    <div class="card-body d-flex flex-column justify-content-between">
-                                                        <p class="card-text fw-semibold mb-2 text-primary">@player</p>
-                                                        <div class="card-img-top">
-                                                        @util.WebUIUtils.cardtoImage(card)
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        }
-                                    } else {
-                                        <div class="col-12">
-                                            <div class="alert alert-info text-center" role="alert">
-                                                <i class="bi bi-info-circle me-2"></i>
-                                                No cards have been selected yet.
-                                            </div>
-                                        </div>
-                                    }
-                                    </div>
-                                }
-                            } else {
-                                <div class="alert alert-warning" role="alert" aria-live="polite">
-                                    <strong>@gamelobby.logic.playerTieLogic.currentTiePlayer().get</strong>
-                                    is currently picking a number for the cut.
-                                </div>
-
-                                <h6 class="mt-4 mb-3">Currently Picked Cards</h6>
-
-                                <div id="cardsplayed" class="row g-3 justify-content-center">
-                                @if(gamelobby.logic.playerTieLogic.getSelectedCard.nonEmpty) {
-                                    @for((player, card) <- gamelobby.logic.playerTieLogic.getSelectedCard) {
-                                        <div class="col-6 col-sm-4 col-md-3 col-lg-2">
-                                            <div class="card shadow-sm border-0 h-100 text-center">
-                                                <div class="card-body d-flex flex-column justify-content-between">
-                                                    <p class="card-text fw-semibold mb-2 text-primary">@player</p>
-                                                    <div class="card-img-top">
-                                                    @util.WebUIUtils.cardtoImage(card)
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    }
-                                } else {
-                                    <div class="col-12">
-                                        <div class="alert alert-info text-center" role="alert">
-                                            <i class="bi bi-info-circle me-2"></i>
-                                            No cards have been selected yet.
-                                        </div>
-                                    </div>
-                                }
-                                </div>
-                            }
-
-                        </div>
-                    </div>
-                </div>
+    <h1>Knockout Whist</h1>
+    <p>The last Round was tied between
+    @for(players <- logic.playerTieLogic.getTiedPlayers) {
+        @players
+    }
+    </p>
+    @if(player.equals(logic.playerTieLogic.currentTiePlayer())) {
+        <p>Pick a card between 1 and @logic.playerTieLogic.highestAllowedNumber()! The resulting card will be your card for the cut.</p>
+    } else {
+        <p>@logic.playerTieLogic.currentTiePlayer() is currently picking his number for the cut.</p>
+        <p>Currently picked Cards:</p>
+        <div id="cardsplayed">
+            @for((player, card) <- logic.playerTieLogic.getSelectedCard) {
+            <div id="playedcardplayer">
+                <p>@player</p>
+                @util.WebUIUtils.cardtoImage(card)
            </div>
+            }
        </div>
-    </div>
+    }
+
 </div>
-<script>
-    connectWebSocket()
-</script>
+}
--- a/knockoutwhistweb/app/views/lobby/lobby.scala.html
+++ b/knockoutwhistweb/app/views/lobby/lobby.scala.html
@@ -1,38 +1,84 @@
@(user: Option[model.users.User], gamelobby: logic.game.GameLobby)
-@import play.api.libs.json._
-<div id="lobby-app-mount"></div>

-<script>
-    // Initialisierung des momentanen Lobby Standes, welcher direkt gerendert werden muss.
+@main("Lobby") {
+<div class="container">
+    <div class="row">
+        <div class="col">
+            <div class="p-3 fs-1 d-flex align-items-center">
+                <div class="text-center" style="flex-grow: 1;">
+                    Lobby-Name: @gamelobby.name
+                </div>
+                <form action="@(routes.IngameController.leaveGame(gamelobby.id))">
+                    <button type="submit" class="btn btn-danger ms-auto">Exit</button>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <div class="p-3 text-center fs-4">Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
+        </div>
+    </div>
+    <div class="row justify-content-center">

-    const initialLobbyName = '@gamelobby.name';
-    const initialLobbyId = '@gamelobby.id';
-
-    const initialIsHost = @{user.map(u => gamelobby.getUserSession(u.id)).exists(_.host)};
-    const initialMaxPlayers = @{gamelobby.maxPlayers};
-
-    const initialPlayers = JSON.parse('@Html({
-        val currentUserId = user.map(_.id).getOrElse(java.util.UUID.randomUUID())
-
-        val playerListForVue = gamelobby.getUsers.toSeq.map { u =>
-            val isSelf = u.id == currentUserId
-            val playerDogStatus = false
-
-            Json.obj(
-                "id" -> u.id.toString,
-                "name" -> u.name,
-                "self" -> isSelf,
-                "dog" -> playerDogStatus
-            )
+        @if((gamelobby.getUserSession(user.get.id).host)) {
+            @for(playersession <- gamelobby.getPlayers.values) {
+                <div class="col-auto">
+                    <div class="card" style="width: 18rem;">
+                        <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
+                        <div class="card-body">
+                            @if(playersession.id == user.get.id) {
+                                <h5 class="card-title">@playersession.name (You)</h5>
+                                <p class="card-text">Your text could be here!</p>
+                                <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
+                            } else {
+                                <h5 class="card-title">@playersession.name</h5>
+                                <p class="card-text">Your text could be here!</p>
+                                <form action="@(routes.IngameController.kickPlayer(gamelobby.id, playersession.id))" method="post">
+                                    <button type="submit" class="btn btn-danger">Remove</button>
+                                </form>
+                            }
+                        </div>
+                    </div>
+                </div>
+            }
+            <div class="row">
+                <div class="col text-center mt-3">
+                    <a href="@(routes.IngameController.startGame(gamelobby.id))" class="btn btn-success">Start Game</a>
+                </div>
+            </div>
+        } else {
+            @for(playersession <- gamelobby.getPlayers.values) {
+            <div class="col-auto">
+                <div class="card" style="width: 18rem;">
+                    <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
+                    <div class="card-body">
+                        @if(playersession.id == user.get.id) {
+                        <h5 class="card-title">@playersession.name (You)</h5>
+                        <p class="card-text">Your text could be here!</p>
+                        } else {
+                        <h5 class="card-title">@playersession.name</h5>
+                        <p class="card-text">Your text could be here!</p>
+                        }
+                    </div>
+                </div>
+            </div>
+            }
+            <div class="row">
+                <div class="col mt-3">
+                    <p class="text-center fs-4">Waiting for the host to start the game...</p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col mt-1">
+                    <div class="text-center">
+                        <div class="spinner-border" role="status">
+                            <span class="visually-hidden">Loading...</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
        }
-        Json.stringify(Json.toJson(playerListForVue))
-    })');
-    connectWebSocket();
-    globalThis.initLobbyVueComponents(
-    initialLobbyName,
-    initialLobbyId,
-    initialIsHost,
-    initialMaxPlayers,
-    initialPlayers
-    );
-</script>
+    </div>
+</div>
+}
--- a/knockoutwhistweb/app/views/login/login.scala.html
+++ b/knockoutwhistweb/app/views/login/login.scala.html
@@ -1,43 +1,41 @@
@()
-<div class="login-box">
-    <div class="card login-card p-4">
-        <div class="card-body">
-            <h3 class="text-center mb-4 text-body">Login</h3>
-            <form onsubmit="login(); return false;">
-                <div class="mb-3">
-                    <label for="username" class="form-label text-body">Username</label>
-                    <input type="text" class="form-control text-body" id="username" name="username" placeholder="Enter Username" required>
-                </div>

-                <div class="mb-3">
-                    <label for="password" class="form-label text-body">Password</label>
-                    <input type="password" class="form-control text-body" id="password" name="password" placeholder="Enter password" required>
-                </div>
+@main("Login") {
+    <div class="login-box">
+        <div class="card login-card p-4">
+            <div class="card-body">
+                <h3 class="text-center mb-4">Login</h3>

-                <div class="d-flex justify-content-between align-items-center mb-3">
-                    <a href="#" class="text-decoration-none">Forgot password?</a>
-                </div>
+                <form action="@routes.UserController.login_Post()" method="post">
+                    <div class="mb-3">
+                        <label for="username" class="form-label">Username</label>
+                        <input type="text" class="form-control" id="username" name="username" placeholder="Enter Username" required>
+                    </div>

-                <div class="d-grid" >
-                    <button type="submit" class="btn btn-primary">Login</button>
-                </div>
-            </form>
+                    <div class="mb-3">
+                        <label for="password" class="form-label">Password</label>
+                        <input type="password" class="form-control" id="password" name="password" placeholder="Enter password" required>
+                    </div>

-            <p class="text-center mt-3">
-                Don’t have an account?
-                <a href="#" class="text-decoration-none">Sign up</a>
-            </p>
+                    <div class="d-flex justify-content-between align-items-center mb-3">
+                        <a href="#" class="text-decoration-none">Forgot password?</a>
+                    </div>
+
+                    <div class="d-grid">
+                        <button type="submit" class="btn btn-primary">Login</button>
+                    </div>
+                </form>
+
+                <p class="text-center mt-3">
+                    Don’t have an account?
+                    <a href="#" class="text-decoration-none">Sign up</a>
+                </p>
+            </div>
        </div>
    </div>
-</div>
-<script src="@routes.Assets.versioned("/javascripts/particles.js")"></script>
-<script>
-        particlesJS.load('particles-js', 'assets/conf/particlesjs-config.json', function() {
-            console.log('callback - particles.js config loaded');
-        });
-        disconnectWebSocket();
-</script>
-<div id="particles-js" style="background-color: rgb(11, 8, 8);
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: 50% 50%;"></div>
+    <script src="@routes.Assets.versioned("/javascripts/particles.js")"></script>
+    <div id="particles-js" style="background-color: rgb(182, 25, 36);
+        background-size: cover;
+        background-repeat: no-repeat;
+        background-position: 50% 50%;"></div>
+}
--- a/knockoutwhistweb/app/views/main.scala.html
+++ b/knockoutwhistweb/app/views/main.scala.html
@@ -1,36 +1,28 @@
@*
-* This template is called from the `index` template. This template
-* handles the rendering of the page header and body tags. It takes
-* two arguments, a `String` for the title of the page and an `Html`
-* object to insert into the body of the page.
-*@
+ * This template is called from the `index` template. This template
+ * handles the rendering of the page header and body tags. It takes
+ * two arguments, a `String` for the title of the page and an `Html`
+ * object to insert into the body of the page.
+ *@
@(title: String)(content: Html)

 <!DOCTYPE html>
 <html lang="en">
    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
        @* Here's where we render the page title `String`. *@
        <title>@title</title>
        <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("stylesheets/main.css")">
        <link rel="shortcut icon" type="image/png" href="@routes.Assets.versioned("images/favicon.png")">
        <link href="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
-    </head>
-    <script src="https://cdn.jsdelivr.net/npm/canvas-confetti@@1.6.0/dist/confetti.browser.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://unpkg.com/vue/dist/vue.global.prod.js"></script>
-    <script src="@routes.JavaScriptRoutingController.javascriptRoutes()" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/websocket.js")" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/events.js")" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/interact.js")" type="text/javascript"></script>
-    <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script>

-    <body class="d-flex flex-column min-vh-100" id="main-body">
-        <div id="alerts-container"></div>
+    </head>
+
+    <body>
        @* And here's where we render the `Html` object containing
-        * the page content. *@
+         * the page content. *@
        @content
+
+        <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
    </body>
 </html>
--- a/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
@@ -1,8 +1,9 @@
@(user: Option[model.users.User])

+@main("Create Game") {
@navbar(user)
-<main class="lobby-background flex-grow-1">
-    <div class="w-25 mx-auto">
+<form action="@routes.MainMenuController.createGame()" method="post">
+    <div class="w-50 mx-auto">
        <div class="mt-3">
            <label for="lobbyname" class="form-label">Lobby-Name</label>
            <input type="text" class="form-control" id="lobbyname" name="lobbyname" placeholder="Lobby 1" required>
@@ -11,23 +12,21 @@
            <input class="form-check-input" type="checkbox" id="visibilityswitch" disabled>
            <label class="form-check-label" for="visibilityswitch">public/private</label>
        </div>
-        <div class="mt-3">
-            <label for="playeramount" class="form-label">Playeramount:</label>
-            <input type="range" class="form-range text-body" min="2" max="7" value="2" id="playeramount" name="playeramount">
-            <div class="d-flex justify-content-between">
-                <span>2</span>
-                <span>3</span>
-                <span>4</span>
-                <span>5</span>
-                <span>6</span>
-                <span>7</span>
+            <div class="mt-3">
+                <label for="playeramount" class="form-label">Playeramount:</label>
+                <input type="range" class="form-range" min="2" max="7" value="2" id="playeramount" name="playeramount">
+                <div class="d-flex justify-content-between">
+                    <span>2</span>
+                    <span>3</span>
+                    <span>4</span>
+                    <span>5</span>
+                    <span>6</span>
+                    <span>7</span>
+                </div>
            </div>
-        </div>
        <div class="mt-3 text-center">
-            <div class="btn btn-success" onclick="createGameJS()">Create Game</div>
+            <button type="submit" class="btn btn-success">Create Game</button>
        </div>
    </div>
-</main>
-<script>
-            disconnectWebSocket();
-</script>
+</form>
+}
--- a/knockoutwhistweb/app/views/mainmenu/navbar.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/navbar.scala.html
@@ -1,55 +1,54 @@
@(user: Option[model.users.User])
-<nav class="navbar navbar-expand-lg bg-body-tertiary navbar-drop-shadow">
-    <div class="container d-flex justify-content-start">
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse justify-content-center" id="navBar">
-            <a class="navbar-brand ms-auto" href="@routes.MainMenuController.mainMenu()">
-                <img src="@routes.Assets.versioned("images/logo.png")" alt="Logo" width="30" height="20" class="d-inline-block align-text-top">
-                KnockOutWhist
-            </a>
-            <div class="navbar-nav me-auto mb-2 mb-lg-0">
-                <ul class="navbar-nav mb-2 mb-lg-0">
-                    @if(user.isDefined) {
+    <nav class="navbar navbar-expand-lg bg-body-tertiary">
+        <div class="container-fluid">
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navBar">
+                <a class="navbar-brand" href="@routes.MainMenuController.mainMenu()">KnockOutWhist</a>
+                <div class="navbar-nav me-auto mb-2 mb-lg-0">
+                    <ul class="navbar-nav mb-2 mb-lg-0">
+                        @if(user.isDefined) {
+                            <li class="nav-item">
+                                <a class="nav-link active" aria-current="page" href="#">Create Game</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link disabled" aria-disabled="true">Lobbies</a>
+                            </li>
+                        }
                        <li class="nav-item">
-                            <a class="nav-link active" aria-current="page" onclick="navSpa('0', 'Knockout Whist - Create Game'); return false;" href="@routes.MainMenuController.mainMenu()">
-                                Create Game</a>
+                            <a class="nav-link active" href="@routes.MainMenuController.rules()">Rules</a>
                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link disabled" aria-disabled="true">Lobbies</a>
+                    </ul>
+                    <form class="navbar-nav me-auto mb-2 mb-lg-0" method="post" action="@routes.MainMenuController.joinGame()">
+                        <input class="form-control me-2" type="text" placeholder="Enter GameCode" name="gameId" aria-label="Join Game"/>
+                        <button class="btn btn-outline-success" type="submit">Join</button>
+                    </form>
+                </div>
+
+                @* Right side: profile dropdown if logged in, otherwise Login / Sign Up buttons *@
+                @if(user.isDefined) {
+                    <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle d-flex align-items-center" href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="rounded-circle" width="30" height="30" />
+                                <span class="ms-2">@user.get.name</span>
+                            </a>
+                            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="profileDropdown">
+                                <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">Stats</a></li>
+                                <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">Settings</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a class="dropdown-item" href="@routes.UserController.logout()">Logout</a></li>
+                            </ul>
                        </li>
-                    }
-                    <li class="nav-item">
-                        <a class="nav-link active" onclick="navSpa('1', 'Knockout Whist - Rules'); return false;" href="@routes.MainMenuController.rules()">
-                            Rules</a>
-                    </li>
-                </ul>
-                <form class="navbar-nav me-auto mb-2 mb-lg-0" onsubmit="joinGame(); return false;">
-                    <input class="form-control me-2" type="text" placeholder="Enter GameCode" id="gameId" aria-label="Join Game"/>
-                    <button class="btn btn-outline-success" type="submit">Join</button>
-                </form>
+                    </ul>
+                } else {
+                    <div class="d-flex ms-auto">
+                        <a class="btn btn-outline-primary me-2" href="@routes.UserController.login()">Login</a>
+                        <a class="btn btn-primary" href="@routes.UserController.login()">Sign Up</a>
+                    </div>
+                }
+
            </div>
-
-            @* Right side: profile dropdown if logged in, otherwise Login / Sign Up buttons *@
-            @if(user.isDefined) {
-                <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle d-flex align-items-center" href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="rounded-circle" width="30" height="30" />
-                            <span class="ms-2">@user.get.name</span>
-                        </a>
-                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="profileDropdown">
-                            <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">
-                                Stats</a></li>
-                            <li><a class="dropdown-item disabled" href="#" tabindex="-1" aria-disabled="true">
-                                Settings</a></li>
-                            <li><hr class="dropdown-divider"></li>
-                        </ul>
-                    </li>
-                </ul>
-            }
-
        </div>
-    </div>
-</nav>
+    </nav>
--- a/knockoutwhistweb/app/views/mainmenu/rules.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/rules.scala.html
@@ -1,180 +1,63 @@
-@(user: Option[model.users.User])
-@navbar(user)
+@()

-<main class="lobby-background flex-grow-1">
-    <div class="container my-4" style="max-width: 980px;">
-        <div class="card rules-card shadow-sm rounded-3 overflow-hidden">
-            <div class="card-header text-center py-3 border-0">
-                <h3 class="mb-0 rules-title">Game Rules Overview</h3>
-            </div>
-
-            <div class="card-body p-0">
-                <style>
-
-                </style>
-
-                <div class="accordion rules-accordion" id="rulesAccordion">
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingPlayers">
-                            <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePlayers" aria-expanded="true" aria-controls="collapsePlayers">
-                                Players
-                            </button>
-                        </h2>
-                        <div id="collapsePlayers" class="accordion-collapse collapse show" aria-labelledby="headingPlayers" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                Two to seven players. The aim is to be the last player left in the game.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingAim">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAim" aria-expanded="false" aria-controls="collapseAim">
-                                Aim
-                            </button>
-                        </h2>
-                        <div id="collapseAim" class="accordion-collapse collapse" aria-labelledby="headingAim" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                To be the last player left at the end of the game, with the object in each hand being to win a majority of tricks.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingEquipment">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseEquipment" aria-expanded="false" aria-controls="collapseEquipment">
-                                Equipment
-                            </button>
-                        </h2>
-                        <div id="collapseEquipment" class="accordion-collapse collapse" aria-labelledby="headingEquipment" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                A standard 52-card pack is used.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingRanks">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseRanks" aria-expanded="false" aria-controls="collapseRanks">
-                                Card Ranks
-                            </button>
-                        </h2>
-                        <div id="collapseRanks" class="accordion-collapse collapse" aria-labelledby="headingRanks" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                In each suit, cards rank from highest to lowest: A K Q J 10 9 8 7 6 5 4 3 2.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingDealFirst">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDealFirst" aria-expanded="false" aria-controls="collapseDealFirst">
-                                Deal (First Hand)
-                            </button>
-                        </h2>
-                        <div id="collapseDealFirst" class="accordion-collapse collapse" aria-labelledby="headingDealFirst" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                The dealer deals seven cards to each player. One card is turned up to determine the trump suit for the round.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingDealSubsequent">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDealSubsequent" aria-expanded="false" aria-controls="collapseDealSubsequent">
-                                Deal (Subsequent Hands)
-                            </button>
-                        </h2>
-                        <div id="collapseDealSubsequent" class="accordion-collapse collapse" aria-labelledby="headingDealSubsequent" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                The deal rotates clockwise. The player who took the most tricks in the previous hand selects the trump suit. If there's a tie, players cut cards to decide who calls trumps. One fewer card is dealt in each successive hand until the final hand consists of one card each.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingPlay">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePlay" aria-expanded="false" aria-controls="collapsePlay">
-                                Play
-                            </button>
-                        </h2>
-                        <div id="collapsePlay" class="accordion-collapse collapse" aria-labelledby="headingPlay" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                The player to the dealer's left (eldest hand) leads the first trick. Any card can be led. Other players must follow suit if possible. A player with no cards of the suit led may play any card.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingWinningTrick">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseWinningTrick" aria-expanded="false" aria-controls="collapseWinningTrick">
-                                Winning a Trick
-                            </button>
-                        </h2>
-                        <div id="collapseWinningTrick" class="accordion-collapse collapse" aria-labelledby="headingWinningTrick" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                The highest card of the suit led wins, unless a trump is played, in which case the highest trump wins. The winner of the trick leads the next.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingLeadingTrumps">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseLeadingTrumps" aria-expanded="false" aria-controls="collapseLeadingTrumps">
-                                Leading Trumps
-                            </button>
-                        </h2>
-                        <div id="collapseLeadingTrumps" class="accordion-collapse collapse" aria-labelledby="headingLeadingTrumps" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                Some rules disallow leading trumps before the suit has been 'broken' (a trump has been played to the lead of another suit). Leading trumps is always permissible if a player holds only trumps.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingKnockout">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseKnockout" aria-expanded="false" aria-controls="collapseKnockout">
-                                Knockout
-                            </button>
-                        </h2>
-                        <div id="collapseKnockout" class="accordion-collapse collapse" aria-labelledby="headingKnockout" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                At the end of each hand, any player who took no tricks is knocked out and takes no further part in the game.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingWinningGame">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseWinningGame" aria-expanded="false" aria-controls="collapseWinningGame">
-                                Winning the Game
-                            </button>
-                        </h2>
-                        <div id="collapseWinningGame" class="accordion-collapse collapse" aria-labelledby="headingWinningGame" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                The game is won when a player takes all the tricks in a round, as all other players are knocked out, leaving only one player remaining.
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingDogLife">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDogLife" aria-expanded="false" aria-controls="collapseDogLife">
-                                Dog Life
-                            </button>
-                        </h2>
-                        <div id="collapseDogLife" class="accordion-collapse collapse" aria-labelledby="headingDogLife" data-bs-parent="#rulesAccordion">
-                            <div class="accordion-body">
-                                The first player who takes no tricks is awarded a \"dog's life\". In the next hand, that player is dealt one card and can decide which trick to play it to. Each time a trick is played the dog may either play the card or knock on the table and wait to play it later. If the dog wins a trick, the player to the left leads the next and the dog re-enters the game properly in the next hand. If the dog fails, they are knocked out.
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</main>
-<script>
-        disconnectWebSocket();
-</script>
+@main("Rules") {
+<div id="rules" class="game-field game-field-background">
+    <table>
+        <caption>Rules Overview and Equipment</caption>
+        <thead>
+        <tr>
+            <th>Section</th>
+            <th>Details</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td>Players</td>
+            <td>Two to seven players. The aim is to be the last player left in the game.</td>
+        </tr>
+        <tr>
+            <td>Aim</td>
+            <td>To be the last player left in at the end of the game, with the object in each hand being to win a majority of tricks.</td>
+        </tr>
+        <tr>
+            <td>Equipment</td>
+            <td>A standard 52-card pack is used.</td>
+        </tr>
+        <tr>
+            <td>Card Ranks</td>
+            <td>In each suit, cards rank from highest to lowest: A K Q J 10 9 8 7 6 5 4 3 2.</td>
+        </tr>
+        <tr>
+            <td>Deal (First Hand)</td>
+            <td>The dealer deals seven cards to each player. One card is turned up to determine the trump suit for the round.</td>
+        </tr>
+        <tr>
+            <td>Deal (Subsequent Hands)</td>
+            <td>The deal rotates clockwise. The player who took the most tricks in the previous hand selects the trump suit. If there's a tie for the highest number of tricks, players cut cards to decide who calls trumps. One fewer card is dealt in each successive hand until the final hand consists of one card each.</td>
+        </tr>
+        <tr>
+            <td>Play</td>
+            <td>The player to the dealer's left (eldest hand) leads the first trick. Any card can be led. Other players must follow suit if possible. A player with no cards of the suit led may play any card.</td>
+        </tr>
+        <tr>
+            <td>Winning a Trick</td>
+            <td>The highest card of the suit led wins, unless a trump is played, in which case the highest trump wins. The winner of the trick leads the next.</td>
+        </tr>
+        <tr>
+            <td>Leading Trumps</td>
+            <td>Some rules disallow leading trumps before the suit has been 'broken' (a trump has been played to the lead of another suit). Leading trumps is always permissible if a player holds only trumps.</td>
+        </tr>
+        <tr>
+            <td>Knockout</td>
+            <td>At the end of each hand, any player who took no tricks is knocked out and takes no further part in the game.</td>
+        </tr>
+        <tr>
+            <td>Winning the Game</td>
+            <td>The game is won when a player takes all the tricks in a round, as all other players are knocked out, leaving only one player remaining.</td>
+        </tr>
+        </tbody>
+            <td>Dog Life</td>
+            <td>The first player who takes no tricks is awarded a "dog's life". In the next hand, that player is dealt one card and can decide which trick to play it to. Each time a trick is played the "dog" may either play the card or knock on the table and wait to play it later. If the dog wins a trick, the player to the left leads to the next and the dog re-enters the game properly in the next hand. If the dog fails, they are knocked out.</td>
+    </table>
+</div>
+}
--- a/knockoutwhistweb/conf/application.conf
+++ b/knockoutwhistweb/conf/application.conf
@@ -1,28 +1,14 @@
 # https://www.playframework.com/documentation/latest/Configuration
 play.filters.disabled += play.filters.csrf.CSRFFilter
-play.filters.disabled += play.filters.hosts.AllowedHostsFilter

-play.http.secret.key="QCY?tAnfk?aZ?iwrNwnxIlR6CTf:G3gf:90Latabg@5241AB`R5W:1uDFN];Ik@n"
-play.http.secret.key=${?APPLICATION_SECRET}

 auth {
  issuer = "knockoutwhistweb"
  audience = "ui"
-  privateKeyFile = ${?PRIVATE_KEY_FILE}
-  privateKeyPem  = ${?PRIVATE_KEY_PEM}
-  publicKeyFile = ${?PUBLIC_KEY_FILE}
+   # ${?PUBLIC_KEY_FILE}
+  privateKeyFile = "D:\\Workspaces\\Gitops\\rsa512-private.pem"
+  privateKeyPem  = ${?PUBLIC_KEY_PEM}
+   #${?PUBLIC_KEY_FILE}
+  publicKeyFile = "D:\\Workspaces\\Gitops\\rsa512-public.pem"
  publicKeyPem  = ${?PUBLIC_KEY_PEM}
 }
-
-play.http.context="/api"
-
-play.modules.enabled += "modules.GatewayModule"
-
-play.filters.enabled += "play.filters.cors.CORSFilter"
-
-play.filters.cors {
-  allowedOrigins = ["http://localhost:5173", "http://localhost:3000", "http://localhost:8081"]
-  allowedCredentials = true
-  allowedHttpMethods = ["GET", "POST", "PUT", "DELETE", "OPTIONS"]
-  allowedHttpHeaders = ["Accept", "Content-Type", "Origin", "X-Requested-With"]
-}
--- a/knockoutwhistweb/conf/logback.xml
+++ b/knockoutwhistweb/conf/logback.xml
@@ -5,48 +5,46 @@
 <!DOCTYPE configuration>

 <configuration>
-    <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" />
-    <import class="ch.qos.logback.classic.AsyncAppender" />
-    <import class="ch.qos.logback.core.FileAppender" />
-    <import class="ch.qos.logback.core.ConsoleAppender" />
+  <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
+  <import class="ch.qos.logback.classic.AsyncAppender"/>
+  <import class="ch.qos.logback.core.FileAppender"/>
+  <import class="ch.qos.logback.core.ConsoleAppender"/>

-    <appender name="FILE" class="FileAppender">
-        <file>${application.home:-.}/logs/application.log</file>
-        <encoder class="PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n
-            </pattern>
-        </encoder>
-    </appender>
+  <appender name="FILE" class="FileAppender">
+    <file>${application.home:-.}/logs/application.log</file>
+    <encoder class="PatternLayoutEncoder">
+      <charset>UTF-8</charset>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
+    </encoder>
+  </appender>

-    <appender name="STDOUT" class="ConsoleAppender">
-        <!--
-             On Windows, enabling Jansi is recommended to benefit from color code interpretation on DOS command prompts,
-             which otherwise risk being sent ANSI escape sequences that they cannot interpret.
-             See https://logback.qos.ch/manual/layouts.html#coloring
-        -->
-        <!-- <withJansi>true</withJansi> -->
-        <encoder class="PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n
-            </pattern>
-        </encoder>
-    </appender>
+  <appender name="STDOUT" class="ConsoleAppender">
+    <!--
+         On Windows, enabling Jansi is recommended to benefit from color code interpretation on DOS command prompts,
+         which otherwise risk being sent ANSI escape sequences that they cannot interpret.
+         See https://logback.qos.ch/manual/layouts.html#coloring
+    -->
+    <!-- <withJansi>true</withJansi> -->
+    <encoder class="PatternLayoutEncoder">
+      <charset>UTF-8</charset>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{pekkoSource}) %msg%n</pattern>
+    </encoder>
+  </appender>

-    <appender name="ASYNCFILE" class="AsyncAppender">
-        <appender-ref ref="FILE" />
-    </appender>
+  <appender name="ASYNCFILE" class="AsyncAppender">
+    <appender-ref ref="FILE"/>
+  </appender>

-    <appender name="ASYNCSTDOUT" class="AsyncAppender">
-        <appender-ref ref="STDOUT" />
-    </appender>
+  <appender name="ASYNCSTDOUT" class="AsyncAppender">
+    <appender-ref ref="STDOUT"/>
+  </appender>

-    <logger name="play" level="INFO" />
-    <logger name="application" level="DEBUG" />
+  <logger name="play" level="INFO"/>
+  <logger name="application" level="DEBUG"/>

-    <root level="WARN">
-        <appender-ref ref="ASYNCFILE" />
-        <appender-ref ref="ASYNCSTDOUT" />
-    </root>
+  <root level="WARN">
+    <appender-ref ref="ASYNCFILE"/>
+    <appender-ref ref="ASYNCSTDOUT"/>
+  </root>

 </configuration>
--- a/knockoutwhistweb/conf/routes
+++ b/knockoutwhistweb/conf/routes
@@ -3,31 +3,28 @@
 # https://www.playframework.com/documentation/latest/ScalaRouting
 # ~~~~

-# For the javascript routing
-GET         /assets/js/routes        controllers.JavaScriptRoutingController.javascriptRoutes()
+
 # Primary routes
-GET         /                        controllers.MainMenuController.index()
-GET         /assets/*file            controllers.Assets.versioned(path="/public", file: Asset)
+GET     /                           controllers.MainMenuController.index()
+GET     /assets/*file               controllers.Assets.versioned(path="/public", file: Asset)

 # Main menu routes
-GET         /mainmenu                controllers.MainMenuController.mainMenu()
-GET         /rules                   controllers.MainMenuController.rules()
-GET         /navSPA/:pType           controllers.MainMenuController.navSPA(pType)
+GET     /mainmenu                   controllers.MainMenuController.mainMenu()
+GET     /rules                      controllers.MainMenuController.rules()

-POST        /createGame              controllers.MainMenuController.createGame()
-POST        /joinGame                controllers.MainMenuController.joinGame()
+POST    /createGame                 controllers.MainMenuController.createGame()
+POST    /joinGame                   controllers.MainMenuController.joinGame()

 # User authentication routes
-POST        /login                   controllers.UserController.login_Post()
-POST        /logout                  controllers.UserController.logoutPost()
-GET         /userInfo                controllers.UserController.getUserInfo()
+GET     /login                      controllers.UserController.login()
+POST    /login                      controllers.UserController.login_Post()
+
+GET     /logout                     controllers.UserController.logout()

 # In-game routes
-GET         /game/:id                controllers.IngameController.game(id: String)
-
-# Websocket
-GET         /websocket               controllers.WebsocketController.socket()
-
-# Status
-GET         /status                  controllers.StatusController.requestStatus()
-GET         /status/:gameId          controllers.StatusController.game(gameId: String)
+GET    /game/:id                    controllers.IngameController.game(id: String)
+GET    /game/:id/join               controllers.IngameController.joinGame(id: String)
+GET    /game/:id/start              controllers.IngameController.startGame(id: String)
+POST    /game/:id/kickPlayer         controllers.IngameController.kickPlayer(id: String, playerId: java.util.UUID)
+GET     /game/:id/leaveGame         controllers.IngameController.leaveGame(id: String)
+POST   /game/:id/playCard           controllers.IngameController.playCard(id: String)
--- a/knockoutwhistweb/public/images/logo.png
+++ b/knockoutwhistweb/public/images/logo.png
--- a/knockoutwhistweb/public/javascripts/events.js
+++ b/knockoutwhistweb/public/javascripts/events.js
@@ -1,653 +0,0 @@
-var canPlayCard = false;
-const PlayerHandComponent = {
-    data() {
-        return {
-            hand: [],
-            isDogPhase: false,
-            isAwaitingResponse: false,
-        };
-    },
-    computed: {
-        isHandInactive() {
-            //TODO: Needs implementation
-        }
-    },
-    template: `
-        <div class="row justify-content-center g-2 mt-4 bottom-div" 
-             style="backdrop-filter: blur(4px); margin-left: 0; margin-right: 0;">
-            
-            <div id="card-slide" class="row justify-content-center ingame-cards-slide" :class="{'inactive': isHandInactive }">
-                
-                <div v-for="card in hand" :key="card.idx" class="col-auto handcard" style="border-radius: 6px">
-                    <div class="btn btn-outline-light p-0 border-0 shadow-none" 
-                         :data-card-id="card.idx" 
-                         style="border-radius: 6px" 
-                         @click="handlePlayCard(card.idx)">
-                        
-                        <img :src="getCardImagePath(card.card)" width="120px" style="border-radius: 6px" :alt="card.card"/>
-                    </div>
-                </div>
-
-                <div v-if="isDogPhase" class="mt-2">
-                    <button class="btn btn-danger" @click="handleSkipDogLife()">Skip Turn</button>
-                </div>
-            </div>
-        </div>
-    `,
-    methods: {
-        updateHand(eventData) {
-            this.hand = eventData.hand.map(card => ({
-                idx: parseInt(card.idx, 10),
-                card: card.card
-            }));
-            this.isDogPhase = false;
-
-            console.log("Vue Data Updated. Hand size:", this.hand.length);
-
-            if (this.hand.length > 0) {
-                console.log("First card path check:", this.getCardImagePath(this.hand[0].card));
-            }
-        },
-        handlePlayCard(cardidx) {
-            if(this.isAwaitingResponse) return
-            if(!canPlayCard) return
-            canPlayCard = false;
-            this.isAwaitingResponse = true
-
-
-            console.debug(`Playing card ${cardidx} from hand`)
-
-            const wiggleKeyframes = [
-                { transform: 'translateX(0)' },
-                { transform: 'translateX(-5px)' },
-                { transform: 'translateX(5px)' },
-                { transform: 'translateX(-5px)' },
-                { transform: 'translateX(0)' }
-            ];
-
-            const wiggleTiming = {
-                duration: 400,
-                iterations: 1,
-                easing: 'ease-in-out',
-                fill: 'forwards'
-            };
-            const targetButton = this.$el.querySelector(`[data-card-id="${cardidx}"]`);
-            const cardElement = targetButton ? targetButton.closest('.handcard') : null;
-
-            const payload = {
-                cardindex: cardidx.toString(),
-                isDog: false
-            }
-            sendEventAndWait("PlayCard", payload).then(
-                () => {
-                    this.hand = this.hand.filter(card => card.idx !== cardidx);
-
-                    this.hand.forEach((card, index) => {
-                        card.idx = index;
-                    })
-                    this.isAwaitingResponse = false;
-                }
-            ).catch(
-                (err) => {
-                    if (cardElement) {
-                        cardElement.animate(wiggleKeyframes, wiggleTiming);
-                    } else {
-                        console.warn(`Could not find DOM element for card index ${cardidx} to wiggle.`);
-                    }
-                    this.isAwaitingResponse = false;
-                    canPlayCard = true;
-
-                }
-            )
-        },
-        handleSkipDogLife() {
-            globalThis.handleSkipDogLife();
-        },
-        getCardImagePath(cardName) {
-            return `/assets/images/cards/${cardName}.png`;
-        }
-    }
-};
-const ScoreBoardComponent = {
-    data() {
-        return {
-            trumpsuit: 'N/A',
-            playerScores: [],
-        };
-    },
-    template: `
-        <div class="score-table mt-5" id="score-table-container">
-            <h4 class="fw-bold mb-3 text-black">Tricks Won</h4>
-
-            <div class="d-flex justify-content-between score-header pb-1">
-                <div style="width: 50%">PLAYER</div>
-                <div style="width: 50%">TRICKS</div>
-            </div>
-
-            <div id="score-table-body">
-                <div v-for="(player, index) in playerScores" 
-                     :key="player.name" 
-                     class="d-flex justify-content-between score-row pt-1">
-                    
-                    <div style="width: 50%" class="text-truncate">
-                        {{ player.name }}
-                    </div>
-                    
-                    <div style="width: 50%">
-                        {{ player.tricks }}
-                    </div>
-                </div>
-            </div>
-        </div>
-    `,
-
-    methods: {
-        calculateNewScores(players, tricklist) {
-            const playercounts = new Map();
-            players.forEach(player => {
-                playercounts.set(player, 0)
-            });
-
-            tricklist.forEach(playerWonTrick => {
-                if (playerWonTrick !== "Trick in Progress" && playercounts.has(playerWonTrick)) {
-                    playercounts.set(playerWonTrick, playercounts.get(playerWonTrick) + 1);
-                }
-            });
-
-            const newScores = players.map(name => ({
-                name: name,
-                tricks: playercounts.get(name) || 0,
-            }));
-
-            newScores.sort((a, b) => b.tricks - a.tricks);
-
-            return newScores;
-        },
-
-        updateNewRoundData(eventData) {
-            console.log("Vue Scoreboard Data Update Triggered: New Round!");
-
-            this.playerScores = eventData.players.map(player => ({
-                name: player,
-                tricks: 0,
-            }));
-        },
-
-        updateTrickEndData(eventData) {
-            const { playerwon, playersin, tricklist } = eventData;
-
-            console.log(`Vue Scoreboard Data Update Triggered: ${playerwon} won the trick!`);
-
-            this.playerScores = this.calculateNewScores(playersin, tricklist);
-
-
-        }
-    }
-};
-const GameInfoComponent = {
-    data() {
-        return {
-            trumpsuit: 'No Trumpsuit',
-            firstCardImagePath: '/assets/images/cards/1B.png',
-        };
-    },
-
-    template: `
-        <div>
-            <h4 class="fw-semibold mb-1">Trumpsuit</h4>
-            <p class="fs-5 text-primary" id="trumpsuit">{{ trumpsuit }}</p>
-
-
-            <h5 class="fw-semibold mt-4 mb-1">First Card</h5>
-            <div class="d-inline-block border rounded shadow-sm p-1 bg-light" id="first-card-container">
-
-                <img :src="firstCardImagePath" alt="First Card" width="80px" style="border-radius: 6px"/>
-            </div>
-        </div>
-    `,
-
-    methods: {
-        resetFirstCard(eventData) {
-            console.log("GameInfoComponent: Resetting First Card to placeholder.");
-            this.firstCardImagePath = '/assets/images/cards/1B.png';
-        },
-        updateFirstCard(eventData) {
-            const firstCardId = eventData.firstCard;
-            console.log("GameInfoComponent: Updating First Card to:", firstCardId);
-
-            let imageSource;
-            if (firstCardId === "BLANK" || !firstCardId) {
-                imageSource = "/assets/images/cards/1B.png";
-            } else {
-                imageSource = `/assets/images/cards/${firstCardId}.png`;
-            }
-            this.firstCardImagePath = imageSource;
-        },
-        updateTrumpsuit(eventData) {
-            this.trumpsuit = eventData.trumpsuit;
-        }
-    }
-};
-const TrickDisplayComponent = {
-    data() {
-        return {
-            playedCards: [],
-        };
-    },
-
-    template: `
-        <div class="d-flex justify-content-center g-3" id="trick-cards-content">
-            <div v-for="(play, index) in playedCards" :key="index" class="col-auto">
-                <div class="card text-center shadow-sm border-0 bg-transparent" style="width: 7rem;
-                    backdrop-filter: blur(4px);">
-                    <div class="p-2">
-                        <img :src="getCardImagePath(play.cardId)" width="100%" style="border-radius: 6px"/>
-                    </div>
-                    <div class="card-body p-2 bg-transparent">
-                        <small class="fw-semibold text-secondary">{{ play.player }}</small>
-                    </div>
-                </div>
-            </div>
-        </div>
-    `,
-
-    methods: {
-        getCardImagePath(cardId) {
-            return `/assets/images/cards/${cardId}.png`;
-        },
-
-        clearPlayedCards() {
-            console.log("TrickDisplayComponent: Clearing played cards.");
-            this.playedCards = [];
-        },
-
-        updatePlayedCards(eventData) {
-            console.log("TrickDisplayComponent: Updating played cards.");
-
-            this.playedCards = eventData.playedCards;
-        }
-    }
-};
-function formatPlayerName(player) {
-    let name = player.name;
-    if (player.dog) {
-        name += " 🐶";
-    }
-    return name;
-}
-
-const TurnComponent = {
-    data() {
-        return {
-            currentPlayerName: 'Waiting...',
-            nextPlayers: [],
-        };
-    },
-
-    template: `
-        <div class="turn-tracker-container">
-            <h4 class="fw-semibold mb-1">Current Player</h4>
-            <p class="fs-3 fw-bold text-success" id="current-player-name">{{ currentPlayerName }}</p>
-
-            <div v-if="nextPlayers.length > 0">
-                <h5 class="fw-semibold mt-4 mb-1" id="next-players-text">Next Players</h5>
-                <div id="next-players-container">
-                    <p v-for="name in nextPlayers" :key="name" class="fs-5 text-primary">{{ name }}</p>
-                </div>
-            </div>
-        </div>
-    `,
-    methods: {
-        updateTurnData(eventData) {
-            console.log("TurnComponent: Updating turn data.");
-            const { currentPlayer, nextPlayers } = eventData;
-
-            this.currentPlayerName = formatPlayerName(currentPlayer);
-
-            this.nextPlayers = nextPlayers.map(player => formatPlayerName(player));
-        }
-    }
-};
-const LobbyComponent = {
-    data() {
-        return {
-            lobbyName: 'Loading...',
-            lobbyId: 'default',
-            isHost: false,
-            maxPlayers: 0,
-            players: [],
-            showKickedModal: false,
-            kickedEventData: null,
-            showSessionClosedModal: false,
-            sessionClosedEventData: null,
-        };
-    },
-
-    template: `
-        <main class="lobby-background vh-100" id="lobbybackground">
-            
-            <div v-if="showKickedModal" class="modal fade show d-block" 
-                 tabindex="-1" 
-                 role="dialog" 
-                 aria-labelledby="kickedModalTitle" 
-                 aria-modal="true" 
-                 style="background-color: rgba(0,0,0,0.5);">
-                
-                <div class="modal-dialog modal-dialog-centered" role="document">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="kickedModalTitle">Kicked</h5>
-                        </div>
-                        <div class="modal-body">
-                            <p>You've been kicked from the lobby.</p>
-                            <p class="text-muted small">You'll get redirected to the mainmenu in 5 seconds...</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-            <div v-if="showSessionClosedModal" class="modal fade show d-block" 
-                 tabindex="-1" 
-                 role="dialog" 
-                 aria-labelledby="sessionClosedModalTitle" 
-                 aria-modal="true" 
-                 style="background-color: rgba(0,0,0,0.5);">
-                <div class="modal-dialog modal-dialog-centered" role="document">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="sessionClosedModalTitle">Session Closed</h5>
-                        </div>
-                        <div class="modal-body">
-                            <p>The session was closed.</p>
-                            <p class="text-muted small">You'll get redirected to the mainmenu in 5 seconds...</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="container d-flex flex-column" style="height: calc(100vh - 1rem);">
-                
-                <div class="row">
-                    <div class="col">
-                        <div class="p-3 fs-1 d-flex align-items-center">
-                            <div class="text-center" style="flex-grow: 1;">
-                                Lobby-Name: {{ lobbyName }}
-                            </div>
-                            <div class="btn btn-danger ms-auto" @click="leaveGame(lobbyId)">Exit</div>
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="row">
-                    <div class="col">
-                        <div class="p-3 text-center fs-4" id="playerAmount">
-                            Players: {{ players.length }} / {{ maxPlayers }}
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="row justify-content-center align-items-center flex-grow-1">
-                    
-                    <template v-if="isHost">
-                        <div id="players" class="justify-content-center align-items-center d-flex flex-wrap">
-                            <div v-for="player in players" :key="player.id" class="col-auto my-auto m-3">
-                                <div class="card" style="width: 18rem;">
-                                    <img src="/assets/images/profile.png" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
-                                    <div class="card-body">
-                                        <h5 class="card-title">
-                                            {{ player.name }} <span v-if="player.self">(You)</span>
-                                        </h5>
-                                        
-                                        <template v-if="player.self">
-                                            <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
-                                        </template>
-                                        <template v-else>
-                                            <div class="btn btn-danger" @click="handleKickPlayer(player.id)">Remove</div>
-                                        </template>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <div class="col-12 text-center mb-5">
-                            <div class="btn btn-success" @click="startGame()">Start Game</div>
-                        </div>
-                    </template>
-                    
-                    <template v-else>
-                        <div id="players" class="justify-content-center align-items-center d-flex flex-wrap">
-                            <div v-for="player in players" :key="player.id" class="col-auto my-auto m-3"> 
-                                <div class="card" style="width: 18rem;">
-                                    <img src="/assets/images/profile.png" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
-                                    <div class="card-body">
-                                        <h5 class="card-title">
-                                            {{ player.name }} <span v-if="player.self">(You)</span>
-                                        </h5>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <div class="col-12 text-center mt-3">
-                            <p class="fs-4">Waiting for the host to start the game...</p>
-                            <div class="spinner-border mt-1" role="status">
-                                <span class="visually-hidden">Loading...</span>
-                            </div>
-                        </div>
-                    </template>
-                    
-                </div>
-            </div>
-        </main>
-    `,
-
-    methods: {
-        updateLobbyData(eventData) {
-            console.log("LobbyComponent: Received Lobby Update Event.");
-
-            this.isHost = eventData.host;
-            this.maxPlayers = eventData.maxPlayers;
-            this.players = eventData.players;
-        },
-
-        setInitialData(name, id) {
-            this.lobbyName = name;
-            this.lobbyId = id;
-        },
-        startGame() {
-            globalThis.startGame()
-        },
-        leaveGame(gameId) {
-            //TODO: Needs implementation
-        },
-        handleKickPlayer(playerId) {
-            globalThis.handleKickPlayer(playerId)
-        },
-        showKickModal(eventData) {
-            this.showKickedModal = true;
-            setTimeout(() => {
-                this.kickedEventData = eventData;
-                this.showKickedModal = false;
-
-                if (typeof globalThis.receiveGameStateChange === 'function') {
-                    globalThis.receiveGameStateChange(this.kickedEventData);
-                } else {
-                    console.error("FATAL: receiveGameStateChange ist nicht global definiert.");
-                }
-            }, 5000);
-        },
-        showSessionClosedModal(eventData) {
-            this.sessionClosedEventData = eventData;
-            this.showSessionClosedModal = true;
-
-            setTimeout(() => {
-                this.showSessionClosedModal = false;
-
-                if (typeof globalThis.receiveGameStateChange === 'function') {
-                    globalThis.receiveGameStateChange(this.sessionClosedEventData);
-                } else {
-                    console.error("FATAL: receiveGameStateChange ist nicht global definiert.");
-                }
-            }, 5000);
-        }
-    }
-};
-
-function requestCardEvent(eventData) {
-    //TODO: Needs correct implementation of setting the inactive class in the PlayerHandComponent
-}
-function receiveGameStateChange(eventData) {
-    const content = eventData.content;
-    const title = eventData.title || 'Knockout Whist';
-    const url = eventData.url || null;
-
-    exchangeBody(content, title, url);
-}
-function receiveRoundEndEvent(eventData) {
-    //TODO: When alert is working, set an alert that shows how won the round and with how much tricks.
-}
-let playerHandApp = null;
-let scoreBoardApp = null;
-let gameInfoApp = null;
-let trickDisplayApp = null;
-let turnApp = null;
-globalThis.initGameVueComponents = function() {
-        // Initializing PlayerHandComponent
-        const app = Vue.createApp(PlayerHandComponent);
-
-        playerHandApp = app;
-        const mountedHand = app.mount('#player-hand-container');
-
-        if (mountedHand && mountedHand.updateHand) {
-            globalThis.updatePlayerHand = mountedHand.updateHand;
-            onEvent("ReceivedHandEvent", globalThis.updatePlayerHand);
-            console.log("PLAYER HAND SYSTEM: updatePlayerHand successfully exposed.");
-        } else {
-            console.error("FATAL ERROR: PlayerHandComponent mount failed. Check if #player-hand-container exists.");
-        }
-
-        // Initializing Scoreboard
-        if (scoreBoardApp) return
-
-        const app2 = Vue.createApp(ScoreBoardComponent)
-        scoreBoardApp = app2
-        const mountedHand2 = app2.mount('#score-table')
-        if (mountedHand2) {
-            globalThis.updateNewRoundData = mountedHand2.updateNewRoundData;
-            onEvent("NewRoundEvent", handleNewRoundEvent);
-
-            globalThis.updateTrickEndData = mountedHand2.updateTrickEndData;
-            onEvent("TrickEndEvent", globalThis.updateTrickEndData);
-            console.log("SCOREBOARD: updateNewRoundData successfully exposed.");
-        } else {
-            console.error("FATAL ERROR: Scoreboard mount failed. Check if #score-table exists.");
-        }
-        // Initializing Gameinfo
-        if (gameInfoApp) return
-
-        const app3 = Vue.createApp(GameInfoComponent)
-        gameInfoApp = app3
-        const mountedGameInfo = app3.mount('#game-info-component')
-        if(mountedGameInfo) {
-            globalThis.resetFirstCard = mountedGameInfo.resetFirstCard;
-            globalThis.updateFirstCard = mountedGameInfo.updateFirstCard;
-            globalThis.updateTrumpsuit = mountedGameInfo.updateTrumpsuit
-            onEvent("NewTrickEvent", handleNewTrickEvent);
-            console.log("GameInfo: resetFirstCard successfully exposed.");
-        } else {
-            console.error("FATAL ERROR: GameInfo mount failed. Check if #score-table exists.");
-        }
-
-        // Initializing TrickCardContainer
-        if (trickDisplayApp) return;
-        const app4 = Vue.createApp(TrickDisplayComponent);
-        trickDisplayApp = app4;
-        const mountedTrickDisplay = app4.mount('#trick-cards-container');
-
-        if (mountedTrickDisplay) {
-            globalThis.clearPlayedCards = mountedTrickDisplay.clearPlayedCards;
-            globalThis.updatePlayedCards = mountedTrickDisplay.updatePlayedCards;
-            onEvent("CardPlayedEvent", handleCardPlayedEvent)
-            console.log("TRICK DISPLAY: Handlers successfully exposed (clearPlayedCards, updatePlayedCards).");
-        } else {
-            console.error("FATAL ERROR: TrickDisplay mount failed. Check if #trick-cards-container exists.");
-        }
-
-        // Initializing TurnContainer
-        if (turnApp) return;
-        const app5 = Vue.createApp(TurnComponent)
-        turnApp = app5;
-        const mountedTurnApp = app5.mount('#turn-component')
-
-        if(mountedTurnApp) {
-            globalThis.updateTurnData = mountedTurnApp.updateTurnData;
-            onEvent("TurnEvent", globalThis.updateTurnData);
-            console.log("TURN DISPLAY: Handlers successfully exposed (clearPlayedCards, updatePlayedCards).");
-        } else {
-            console.error("FATAL ERROR: TURNAPP mount failed. Check if #trick-cards-container exists.");
-        }
-}
-let lobbyApp = null;
-globalThis.initLobbyVueComponents = function(initialLobbyName, initialLobbyId, initialIsHost, initialMaxPlayers, initialPlayers) {
-
-    if (lobbyApp) return;
-
-    const appLobby = Vue.createApp(LobbyComponent);
-    lobbyApp = appLobby;
-    const mountedLobby = appLobby.mount('#lobby-app-mount');
-
-    if (mountedLobby) {
-        mountedLobby.setInitialData(initialLobbyName, initialLobbyId);
-
-        //Damit beim erstmaligen Betreten der Lobby die Spieler etc. angezeigt werden.
-        mountedLobby.updateLobbyData({
-            host: initialIsHost,
-            maxPlayers: initialMaxPlayers,
-            players: initialPlayers
-        });
-
-        globalThis.updateLobbyData = mountedLobby.updateLobbyData;
-        globalThis.showKickModal = mountedLobby.showKickModal;
-        globalThis.showSessionClosedModal = mountedLobby.showSessionClosedModal;
-        onEvent("LobbyUpdateEvent", globalThis.updateLobbyData);
-        onEvent("KickEvent", globalThis.showKickModal);
-        onEvent("SessionClosed", globalThis.showSessionClosedModal);
-        console.log("LobbyComponent successfully mounted and registered events.");
-    } else {
-        console.error("FATAL ERROR: LobbyComponent mount failed.");
-    }
-}
-function handleCardPlayedEvent(eventData) {
-    console.log("CardPlayedEvent received. Updating Game Info and Trick Display.");
-
-    if (typeof globalThis.updateFirstCard === 'function') {
-        globalThis.updateFirstCard(eventData);
-    }
-
-    if (typeof globalThis.updatePlayedCards === 'function') {
-        globalThis.updatePlayedCards(eventData);
-    }
-}
-function handleNewTrickEvent(eventData) {
-    if (typeof globalThis.resetFirstCard === 'function') {
-        globalThis.resetFirstCard(eventData);
-    }
-
-    if (typeof globalThis.clearPlayedCards === 'function') {
-        globalThis.clearPlayedCards();
-    }
-}
-function handleNewRoundEvent(eventData) {
-    if (typeof globalThis.updateNewRoundData === 'function') {
-        globalThis.updateNewRoundData(eventData);
-    }
-    if (typeof globalThis.updateTrumpsuit === 'function') {
-        globalThis.updateTrumpsuit(eventData);
-    }
-}
-
-onEvent("GameStateChangeEvent", receiveGameStateChange)
-onEvent("LeftEvent", receiveGameStateChange)
-onEvent("RequestCardEvent", requestCardEvent)
-onEvent("RoundEndEvent", receiveRoundEndEvent)
--- a/knockoutwhistweb/public/javascripts/interact.js
+++ b/knockoutwhistweb/public/javascripts/interact.js
@@ -1,33 +0,0 @@
-function handlePlayCard(cardidx) {
-    //TODO: Needs implementation
-}
-
-function handleSkipDogLife(button) {
-    // TODO needs implementation
-}
-function startGame() {
-    sendEvent("StartGame")
-}
-
-function handleTrumpSelection(object) {
-    const $button = $(object);
-    const trumpIndex = parseInt($button.data('trump'));
-    const payload = {
-        suitIndex: trumpIndex
-    }
-    sendEvent("PickTrumpsuit", payload)
-
-}
-function handleKickPlayer(playerId) {
-    sendEvent("KickPlayer", {
-        playerId: playerId
-    })
-}
-function handleReturnToLobby() {
-    sendEvent("ReturnToLobby")
-}
-
-globalThis.startGame = startGame
-globalThis.handleTrumpSelection = handleTrumpSelection
-globalThis.handleKickPlayer = handleKickPlayer
-globalThis.handleReturnToLobby = handleReturnToLobby
--- a/knockoutwhistweb/public/javascripts/main.js
+++ b/knockoutwhistweb/public/javascripts/main.js
@@ -1,222 +1,3 @@
-/*!
- * Color mode toggler for Bootstrap's docs (https://getbootstrap.com/)
- * Copyright 2011-2025 The Bootstrap Authors
- * Licensed under the Creative Commons Attribution 3.0 Unported License.
- */
-
-(() => {
-    'use strict'
-
-    const getStoredTheme = () => localStorage.getItem('theme')
-    const setStoredTheme = theme => localStorage.setItem('theme', theme)
-
-    const getPreferredTheme = () => {
-        const storedTheme = getStoredTheme()
-        if (storedTheme) {
-            return storedTheme
-        }
-
-        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
-    }
-
-    const setTheme = theme => {
-        if (theme === 'auto') {
-            document.documentElement.setAttribute('data-bs-theme', (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'))
-        } else {
-            document.documentElement.setAttribute('data-bs-theme', theme)
-        }
-    }
-
-    setTheme(getPreferredTheme())
-
-    const showActiveTheme = (theme, focus = false) => {
-        const themeSwitcher = document.querySelector('#bd-theme')
-
-        if (!themeSwitcher) {
-            return
-        }
-
-        const themeSwitcherText = document.querySelector('#bd-theme-text')
-        const activeThemeIcon = document.querySelector('.theme-icon-active use')
-        const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
-        const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href')
-
-        document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
-            element.classList.remove('active')
-            element.setAttribute('aria-pressed', 'false')
-        })
-
-        btnToActive.classList.add('active')
-        btnToActive.setAttribute('aria-pressed', 'true')
-        activeThemeIcon.setAttribute('href', svgOfActiveBtn)
-        const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})`
-        themeSwitcher.setAttribute('aria-label', themeSwitcherLabel)
-
-        if (focus) {
-            themeSwitcher.focus()
-        }
-    }
-
-    window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
-        const storedTheme = getStoredTheme()
-        if (storedTheme !== 'light' && storedTheme !== 'dark') {
-            setTheme(getPreferredTheme())
-        }
-    })
-
-    window.addEventListener('DOMContentLoaded', () => {
-        showActiveTheme(getPreferredTheme())
-
-        document.querySelectorAll('[data-bs-theme-value]')
-            .forEach(toggle => {
-                toggle.addEventListener('click', () => {
-                    const theme = toggle.getAttribute('data-bs-theme-value')
-                    setStoredTheme(theme)
-                    setTheme(theme)
-                    showActiveTheme(theme, true)
-                })
-            })
-    })
-})()
-
-function createGameJS() {
-    let lobbyName = $('#lobbyname').val();
-    if ($.trim(lobbyName) === "") {
-        lobbyName = "DefaultLobby"
-    }
-    const jsonObj = {
-        lobbyname: lobbyName,
-        playeramount: $("#playeramount").val()
-    }
-    sendGameCreationRequest(jsonObj);
-}
-
-function sendGameCreationRequest(dataObject) {
-    const route = jsRoutes.controllers.MainMenuController.createGame();
-
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        data: JSON.stringify(dataObject),
-        dataType: 'json',
-        success: (data => {
-            if (data.status === 'success') {
-                exchangeBody(data.content, "Knockout Whist - Lobby", data.redirectUrl);
-            }
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData && errorData.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
-        })
-    })
-}
-
-function exchangeBody(content, title = "Knockout Whist", url = null) {
-    if (url) {
-        window.history.pushState({}, title, url);
-    }
-    $("#main-body").html(content);
-    document.title = title;
-}
-
-function login() {
-    const username = $('#username').val();
-    const password = $('#password').val();
-
-    const jsonObj = {
-        username: username,
-        password: password
-    };
-
-    const route = jsRoutes.controllers.UserController.login_Post();
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        success: (data => {
-            if (data.status === 'success') {
-                exchangeBody(data.content, 'Knockout Whist - Create Game', data.redirectUrl);
-                return
-            }
-            alert('Login failed. Please check your credentials and try again.');
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData?.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
-        })
-    });
-}
-
-function joinGame() {
-    const gameId = $('#gameId').val();
-
-    const jsonObj = {
-        gameId: gameId
-    };
-
-    const route = jsRoutes.controllers.MainMenuController.joinGame();
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        success: (data => {
-            if (data.status === 'success') {
-                exchangeBody(data.content, "Knockout Whist - Lobby", data.redirectUrl);
-                return
-            }
-            alert('Could not join the game. Please check the Game ID and try again.');
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData?.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
-        })
-    });
-    return false
-}
-
-function navSpa(page, title) {
-    const route = jsRoutes.controllers.MainMenuController.navSPA(page);
-    $.ajax({
-        url: route.url,
-        type: route.type,
-        contentType: 'application/json',
-        dataType: 'json',
-        data: JSON.stringify(jsonObj),
-        success: (data => {
-            if (data.status === 'success') {
-                exchangeBody(data.content, title, data.redirectUrl);
-                return
-            }
-            alert('Could not join the game. Please check the Game ID and try again.');
-        }),
-        error: ((jqXHR) => {
-            const errorData = JSON.parse(jqXHR.responseText);
-            if (errorData?.errorMessage) {
-                alert(`${errorData.errorMessage}`);
-            } else {
-                alert(`An unexpected error occurred. Please try again. Status: ${jqXHR.status}`);
-            }
-        })
-    });
-    return false
-}
-
-
-globalThis.exchangeBody = exchangeBody;
+particlesJS.load('particles-js', 'assets/conf/particlesjs-config.json', function() {
+    console.log('callback - particles.js config loaded');
+});
--- a/knockoutwhistweb/public/javascripts/particles.js
+++ b/knockoutwhistweb/public/javascripts/particles.js
--- a/knockoutwhistweb/public/javascripts/websocket.js
+++ b/knockoutwhistweb/public/javascripts/websocket.js
@@ -1,192 +0,0 @@
-let ws = null;
-const pending = new Map();
-const handlers = new Map(); 
-
-let timer = null;
-
-function setupSocketHandlers(socket) {
-    socket.onmessage = (event) => {
-        console.debug("SERVER MESSAGE:", event.data);
-        let msg;
-        try {
-            msg = JSON.parse(event.data);
-        } catch (e) {
-            console.debug("Non-JSON message from server:", event.data, e);
-            return;
-        }
-
-        const id = msg.id;
-        const eventType = msg.event;
-        const status = msg.status;
-        const data = msg.data;
-
-        if (id && typeof status === "string") {
-            const entry = pending.get(id);
-            if (!entry) return;
-            clearTimeout(entry.timer);
-            pending.delete(id);
-
-            if (status === "success") {
-                entry.resolve(data === undefined ? {} : data);
-            } else {
-                entry.reject(new Error(msg.error || "Server returned error"));
-            }
-            return;
-        }
-
-        if (id && eventType) {
-            const handler = handlers.get(eventType);
-            const sendResponse = (result) => {
-                const response = {id: id, event: eventType, status: result};
-                if (socket && socket.readyState === WebSocket.OPEN) {
-                    socket.send(JSON.stringify(response));
-                } else {
-                    console.warn("Cannot send response, websocket not open");
-                }
-            };
-
-            if (!handler) {
-                console.warn("No handler for event:", eventType);
-                sendResponse({error: "No handler for event: " + eventType});
-                return;
-            }
-
-            try {
-                Promise.resolve(handler(data === undefined ? {} : data))
-                    .then(_ => sendResponse("success"))
-                    .catch(_ => sendResponse("error"));
-            } catch (err) {
-                sendResponse("error");
-            }
-        }
-    };
-
-    socket.onerror = (error) => {
-        console.error("WebSocket Error:", error);
-        if (timer) clearInterval(timer);
-        for (const [id, entry] of pending.entries()) {
-            clearTimeout(entry.timer);
-            entry.reject(new Error("WebSocket error/closed"));
-            pending.delete(id);
-        }
-        if (socket.readyState === WebSocket.OPEN) socket.close(1000, "Unexpected error.");
-    };
-
-    socket.onclose = (event) => {
-        if (timer) clearInterval(timer);
-        for (const [id, entry] of pending.entries()) {
-            clearTimeout(entry.timer);
-            entry.reject(new Error("WebSocket closed"));
-            pending.delete(id);
-        }
-        if (event.wasClean) {
-            console.log(`Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-        } else {
-            console.warn('Connection died unexpectedly.');
-        }
-        location.href = "/mainmenu";
-    };
-}
-
-function connectWebSocket(url = null) {
-    if (!url) {
-        const loc = window.location;
-        const protocol = loc.protocol === "https:" ? "wss:" : "ws:";
-        url = protocol + "//" + loc.host + "/websocket";
-    }
-    if (ws && ws.readyState === WebSocket.OPEN) return Promise.resolve();
-    if (ws && ws.readyState === WebSocket.CONNECTING) {
-        return new Promise((resolve, reject) => {
-            const prevOnOpen = ws.onopen;
-            const prevOnError = ws.onerror;
-            ws.onopen = (ev) => {
-                if (prevOnOpen) prevOnOpen(ev);
-                resolve();
-            };
-            ws.onerror = (err) => {
-                if (prevOnError) prevOnError(err);
-                reject(err);
-            };
-        });
-    }
-
-    ws = new WebSocket(url);
-    setupSocketHandlers(ws);
-
-    return new Promise((resolve, reject) => {
-        ws.onopen = () => {
-            console.log("WebSocket connection established!");
-            timer = setInterval(() => {
-                if (ws && ws.readyState === WebSocket.OPEN) {
-                    sendEventAndWait("ping", {}).then(
-                        () => console.debug("PING RESPONSE RECEIVED"),
-                    ).catch(
-                        (err) => console.warn("PING ERROR:", err.message),
-                    );
-                    console.debug("PING SENT");
-                }
-            }, 5000);
-            resolve();
-        };
-
-        ws.onerror = (err) => {
-            reject(err);
-        };
-    });
-}
-
-function disconnectWebSocket(code = 1000, reason = "Client disconnect") {
-    if (timer) {
-        clearInterval(timer);
-        timer = null;
-    }
-    if (ws) {
-        try {
-            ws.close(code, reason);
-        } catch (e) {
-        }
-        ws = null;
-    }
-}
-
-function sendEvent(eventType, eventData) {
-    if (!ws || ws.readyState !== WebSocket.OPEN) {
-        console.warn("WebSocket is not open. Unable to send message.");
-        return;
-    }
-    const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 9);
-    const message = {id: id, event: eventType, data: eventData};
-    ws.send(JSON.stringify(message));
-    console.debug("SENT:", message);
-}
-
-function sendEventAndWait(eventType, eventData, timeoutMs = 10000) {
-    if (!ws || ws.readyState !== WebSocket.OPEN) {
-        return Promise.reject(new Error("WebSocket is not open"));
-    }
-    const id = Date.now().toString(36) + Math.random().toString(36).substring(2, 9);
-    const message = {id: id, event: eventType, data: eventData};
-    const p = new Promise((resolve, reject) => {
-        const timerId = setTimeout(() => {
-            if (pending.has(id)) {
-                pending.delete(id);
-                reject(new Error(`No response within ${timeoutMs}ms for id=${id}`));
-            }
-        }, timeoutMs);
-        pending.set(id, {resolve, reject, timer: timerId});
-    });
-    ws.send(JSON.stringify(message));
-    console.debug("SENT (await):", message);
-    return p;
-}
-
-function onEvent(eventType, handler) {
-    handlers.set(eventType, handler);
-}
-
-globalThis.sendEvent = sendEvent;
-globalThis.sendEventAndWait = sendEventAndWait;
-globalThis.onEvent = onEvent;
-globalThis.connectWebSocket = connectWebSocket;
-globalThis.disconnectWebSocket = disconnectWebSocket;
-globalThis.isWebSocketConnected = () => !!ws && ws.readyState === WebSocket.OPEN;
--- a/knockoutwhistweb/test/controllers/HomeControllerSpec.scala
+++ b/knockoutwhistweb/test/controllers/HomeControllerSpec.scala
@@ -13,33 +13,33 @@ import play.api.test.Helpers.*
 */
 class HomeControllerSpec extends PlaySpec with GuiceOneAppPerTest with Injecting {

-  //  "HomeController GET" should {
-  //
-  //    "render the index page from a new instance of controller" in {
-  //      val controller = new HomeController(stubControllerComponents())
-  //      val home = controller.index().apply(FakeRequest(GET, "/"))
-  //
-  //      status(home) mustBe OK
-  //      contentType(home) mustBe Some("text/html")
-  //      contentAsString(home) must include ("Welcome to Play")
-  //    }
-  //
-  //    "render the index page from the application" in {
-  //      val controller = inject[HomeController]
-  //      val home = controller.index().apply(FakeRequest(GET, "/"))
-  //
-  //      status(home) mustBe OK
-  //      contentType(home) mustBe Some("text/html")
-  //      contentAsString(home) must include ("Welcome to Play")
-  //    }
-  //
-  //    "render the index page from the router" in {
-  //      val request = FakeRequest(GET, "/")
-  //      val home = route(app, request).get
-  //
-  //      status(home) mustBe OK
-  //      contentType(home) mustBe Some("text/html")
-  //      contentAsString(home) must include ("Welcome to Play")
-  //    }
-  //  }
+//  "HomeController GET" should {
+//
+//    "render the index page from a new instance of controller" in {
+//      val controller = new HomeController(stubControllerComponents())
+//      val home = controller.index().apply(FakeRequest(GET, "/"))
+//
+//      status(home) mustBe OK
+//      contentType(home) mustBe Some("text/html")
+//      contentAsString(home) must include ("Welcome to Play")
+//    }
+//
+//    "render the index page from the application" in {
+//      val controller = inject[HomeController]
+//      val home = controller.index().apply(FakeRequest(GET, "/"))
+//
+//      status(home) mustBe OK
+//      contentType(home) mustBe Some("text/html")
+//      contentAsString(home) must include ("Welcome to Play")
+//    }
+//
+//    "render the index page from the router" in {
+//      val request = FakeRequest(GET, "/")
+//      val home = route(app, request).get
+//
+//      status(home) mustBe OK
+//      contentType(home) mustBe Some("text/html")
+//      contentAsString(home) must include ("Welcome to Play")
+//    }
+//  }
 }
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -6,5 +6,3 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1")

 addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")
-addSbtPlugin("nl.gn0s1s" % "sbt-dotenv" % "3.2.0")
-
--- a/versions.env
+++ b/versions.env
@@ -1,3 +1,3 @@
-MAJOR=4
-MINOR=18
+MAJOR=2
+MINOR=0
 PATCH=0
Author	SHA1	Message	Date
LQ63	edfba93f83	feat(ui): added working ingame ui Added ingame ui with bootstrap. There were problems with the lock procedure	2025-11-05 11:39:50 +01:00
LQ63	4f7eed9ac4	feat(ui): add Lobby and Main Menu Body Added main Menu body and a Lobby with Bootstrap	2025-11-05 11:38:32 +01:00
LQ63	ee3f65efd9	feat(ui): added working ingame ui Added ingame ui with bootstrap. There were problems with the lock procedure which are now fixed.	2025-11-05 11:36:08 +01:00
LQ63	89d1626bb2	feat(ui): add Lobby and Main Menu Body Added main Menu body and a Lobby with Bootstrap	2025-11-05 11:32:26 +01:00