ci: bump version to v4.16.0

feat(ui): FRO-36 PWA (#110 )
Added localhost:3000 to CORS for PWA to work Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #110 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>
2025-12-18 08:51:00 +00:00 · 2025-12-18 09:47:25 +01:00 · 2025-12-14 14:15:11 +00:00 · 2025-12-14 15:10:43 +01:00 · 2025-12-11 06:13:24 +00:00 · 2025-12-11 07:10:24 +01:00
125 changed files with 7232 additions and 569 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1 @@
+.env
--- a/.gitea/ISSUE_TEMPLATE/epic.md
+++ b/.gitea/ISSUE_TEMPLATE/epic.md
@@ -0,0 +1,46 @@
+---
+name: "Epic"
+about: "A large initiative or feature that consists of multiple User Stories or Subtasks"
+title: "[Epic] <Epic title>"
+labels: ["Type/Epic"]
+---
+
+## 🧩 Epic Summary
+Provide a clear summary of what this Epic aims to achieve.
+
+---
+
+## 🎯 Goals
+- [ ] Goal 1
+- [ ] Goal 2
+- [ ] Goal 3
+
+---
+
+## 📋 Description
+Describe the high-level context, purpose, and expected outcome of this Epic.
+
+---
+
+## 🧵 Related User Stories / Subtasks
+Link to related issues here:
+- [ ] #<user-story-1>
+- [ ] #<user-story-2>
+- [ ] #<subtask-1>
+
+---
+
+## 📅 Milestone / Timeline
+If applicable, note any key dates or milestones:
+- Target Start:
+- Target Completion:
+
+---
+
+## ⚠️ Risks / Dependencies
+List any major risks or dependencies that could affect delivery.
+
+---
+
+## ✅ Acceptance Criteria
+Define the success metrics or completion definition for the Epic.
--- a/.gitea/ISSUE_TEMPLATE/subtask.md
+++ b/.gitea/ISSUE_TEMPLATE/subtask.md
@@ -0,0 +1,35 @@
+---
+name: "Subtask"
+about: "A smaller task that contributes to a User Story or Epic"
+title: "[Subtask] <Task title>"
+labels: ["Type/Subtask"]
+---
+
+## 🧾 Description
+Briefly describe what needs to be done for this subtask.
+
+---
+
+## 🔗 Linked Issues
+- Parent Story: #<user-story-number>
+- Related Epic: #<epic-number>
+
+---
+
+## ⚙️ Steps / Tasks
+- [ ] Task 1
+- [ ] Task 2
+- [ ] Task 3
+
+---
+
+## ✅ Definition of Done
+What must be true for this subtask to be considered complete:
+- [ ] Code implemented
+- [ ] Tests passed
+- [ ] Reviewed and merged
+
+---
+
+## 🧩 Estimated Size
+Use label: `Size/XS` | `Size/S` | `Size/M` | `Size/L` | `Size/XL`
--- a/.gitea/ISSUE_TEMPLATE/user_story.md
+++ b/.gitea/ISSUE_TEMPLATE/user_story.md
@@ -0,0 +1,42 @@
+---
+name: "User Story"
+about: "A feature or requirement from the user's perspective"
+title: "[Story] <User story title>"
+labels: ["Type/User Story"]
+---
+
+## 🧍‍♂️ User Story
+**As a** [type of user]  
+**I want to** [perform an action]  
+**So that** [achieve a goal or value]
+
+---
+
+## 📋 Description
+Provide additional context or business logic for this story.
+
+---
+
+## 🎯 Acceptance Criteria
+List the specific, measurable criteria that define when this story is done:
+- [ ] Criterion 1
+- [ ] Criterion 2
+- [ ] Criterion 3
+
+---
+
+## 🧱 Implementation Notes
+Include technical notes, design references, or constraints.
+
+---
+
+## 🧵 Linked Issues
+- Parent Epic: #<epic-number>
+- Related Subtasks:
+  - [ ] #<subtask-1>
+  - [ ] #<subtask-2>
+
+---
+
+## 🧩 Estimated Size
+Use label: `Size/XS` | `Size/S` | `Size/M` | `Size/L` | `Size/XL`
--- a/.gitignore
+++ b/.gitignore
@@ -134,6 +134,9 @@ target
 /.project
 /.settings
 /RUNNING_PID
+/knockoutwhistwebfrontend/
 /knockoutwhist/
 /knockoutwhistweb/.g8/
 /knockoutwhistweb/.bsp/
+/currentSnapshot.json
+.env
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,9 @@
 [submodule "knockoutwhist"]
 	path = knockoutwhist
-	branch = webapplication
+	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
@@ -0,0 +1,2 @@
+-J--add-opens=java.base/java.util=ALL-UNNAMED
+-J--add-opens=java.base/java.lang=ALL-UNNAMED
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,261 @@
+##  (2025-11-07)
+
+### ⚠ BREAKING CHANGES
+
+* implemented multigame support (#34)
+
+### 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)
+* **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
+
+* **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)
+
+### ⚠ BREAKING CHANGES
+
+* implemented multigame support (#34)
+
+### 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)
+* **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
+
+* **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)
+
+### ⚠ BREAKING CHANGES
+
+* **game:** Fixed polling, SPA, Gameplayloop etc. (#59)
+
+### 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))
+
+### 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)
+
+### Bug Fixes
+
+* **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)
+
+### ⚠ BREAKING CHANGES
+
+* **websocket:** Implement WebSocket connection and event handling (#82)
+
+### 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))
+
+### 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)
+
+### 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)
+
+### 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))
--- a/41
+++ b/41
@@ -0,0 +1,41 @@
+# === Stage 1: Build the Play application ===
+FROM sbtscala/scala-sbt:eclipse-temurin-alpine-22_36_1.10.3_3.5.1 AS builder
+
+WORKDIR /app
+
+# Install Node.js and Less CSS preprocessor
+USER root
+RUN apk add --no-cache nodejs npm && \
+    npm install -g less
+
+# Cache dependencies first
+COPY project ./project
+COPY build.sbt ./
+RUN sbt -Dscoverage.skip=true update
+
+# Copy the rest of the code
+COPY . .
+
+# Build the app and stage it
+RUN sbt -Dscoverage.skip=true clean stage
+
+# === Stage 2: Runtime image ===
+FROM eclipse-temurin:21-jre-alpine
+
+# Install Argon2 CLI and libraries
+RUN apk add --no-cache bash argon2 argon2-libs
+
+WORKDIR /opt/playapp
+
+# Copy staged Play build
+COPY --from=builder /app/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/README.md
+++ b/README.md
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+## User Password Protection
+
+All the User Passwords are encrypted using Argon2.
--- a/bruno/KnockOutWhist/Game/Create
+++ b/bruno/KnockOutWhist/Game/Create
@@ -0,0 +1,16 @@
+meta {
+  name: Create Game
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{host}}/createGame
+  body: none
+  auth: inherit
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}
--- a/bruno/KnockOutWhist/Game/Get
+++ b/bruno/KnockOutWhist/Game/Get
@@ -0,0 +1,20 @@
+meta {
+  name: Get Game
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{host}}/game/:id
+  body: none
+  auth: inherit
+}
+
+params:path {
+  id: BZvtJ3
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}
--- a/bruno/KnockOutWhist/Game/Start
+++ b/bruno/KnockOutWhist/Game/Start
@@ -0,0 +1,20 @@
+meta {
+  name: Start Game
+  type: http
+  seq: 3
+}
+
+post {
+  url: {{host}}/game/:id/start
+  body: none
+  auth: inherit
+}
+
+params:path {
+  id: nR1o3n
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}
--- a/bruno/KnockOutWhist/Game/folder.bru
+++ b/bruno/KnockOutWhist/Game/folder.bru
@@ -0,0 +1,8 @@
+meta {
+  name: Game
+  seq: 3
+}
+
+auth {
+  mode: inherit
+}
--- a/bruno/KnockOutWhist/Login.bru
+++ b/bruno/KnockOutWhist/Login.bru
@@ -0,0 +1,26 @@
+meta {
+  name: Login
+  type: http
+  seq: 2
+}
+
+post {
+  url: {{host}}/login
+  body: formUrlEncoded
+  auth: inherit
+}
+
+body:form-urlencoded {
+  username: Janis
+  password: password123
+}
+
+body:multipart-form {
+  username: Janis
+  password: password123
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}
--- a/bruno/KnockOutWhist/bruno.json
+++ b/bruno/KnockOutWhist/bruno.json
@@ -0,0 +1,9 @@
+{
+  "version": "1",
+  "name": "KnockOutWhist",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ]
+}
--- a/knockoutwhistweb/public/stylesheets/main.css
+++ b/knockoutwhistweb/public/stylesheets/main.css
--- a/bruno/KnockOutWhist/environments/Local.bru
+++ b/bruno/KnockOutWhist/environments/Local.bru
@@ -0,0 +1,3 @@
+vars {
+  host: http://localhost:9000
+}
--- a/build.sbt
+++ b/build.sbt
@@ -1,12 +1,12 @@
 ThisBuild / scalaVersion := "3.5.1"

 lazy val commonSettings = Seq(
-  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 += "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 ++= {
    // Determine OS version of JavaFX binaries
    lazy val osName = System.getProperty("os.name") match {
@@ -19,8 +19,6 @@ lazy val commonSettings = Seq(
      .map(m => "org.openjfx" % s"javafx-$m" % "21" classifier osName)
  },
  libraryDependencies += guice,
-  Test / testOptions += Tests.Filter(_.equals("de.knockoutwhist.TestSequence")),
-  coverageEnabled := true,
  coverageFailOnMinimum := true,
  coverageMinimumStmtTotal := 85,
  coverageMinimumBranchTotal := 100
@@ -29,7 +27,8 @@ lazy val commonSettings = Seq(
 lazy val knockoutwhist = project.in(file("knockoutwhist"))
  .settings(
    commonSettings,
-    mainClass := Some("de.knockoutwhist.KnockOutWhist")
+    mainClass := Some("de.knockoutwhist.KnockOutWhist"),
+    coverageExcludedPackages := "de.knockoutwhist.ui.*;de.knockoutwhist.utils.gui.*"
  )

 lazy val knockoutwhistweb = project.in(file("knockoutwhistweb"))
@@ -37,7 +36,12 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb"))
  .dependsOn(knockoutwhist % "compile->compile;test->test")
  .settings(
    commonSettings,
-    libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.2" % Test
+    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",
+    JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
  )

 lazy val root = (project in file("."))
--- a/conventionalcommit.json
+++ b/conventionalcommit.json
@@ -0,0 +1,116 @@
+{
+  "$schema": "https://github.com/lppedd/idea-conventional-commit/raw/master/src/main/resources/defaults/conventionalcommit.schema.json",
+  "types": {
+    "refactor": {
+      "description": "Changes which neither fix a bug nor add a feature"
+    },
+    "fix": {
+      "description": "Changes which patch a bug"
+    },
+    "feat": {
+      "description": "Changes which introduce a new feature"
+    },
+    "build": {
+      "description": "Changes which affect the build system or external dependencies.<br>Example scopes: gulp, broccoli, npm",
+      "scopes": {
+        "npm": {},
+        "gulp": {},
+        "broccoli": {}
+      }
+    },
+    "chore": {
+      "description": "Changes which are not user-facing"
+    },
+    "style": {
+      "description": "Changes which do not affect code logic, such as whitespaces, formatting, missing semicolons"
+    },
+    "test": {
+      "description": "Changes which add missing tests or fix existing ones"
+    },
+    "docs": {
+      "description": "Changes which affect documentation"
+    },
+    "perf": {
+      "description": "Changes which improve performance"
+    },
+    "ci": {
+      "description": "Changes which affect CI configuration files and scripts.<br>Example scopes: travis, circle, browser-stack, sauce-labs"
+    },
+    "revert": {
+      "description": "Changes which revert a previous commit"
+    }
+  },
+  "commonScopes": {
+    "api": {
+      "description": "Changes related to the API"
+    },
+    "auth": {
+      "description": "Changes related to authentication"
+    },
+    "config": {
+      "description": "Changes related to configuration"
+    },
+    "db": {
+      "description": "Changes related to the database"
+    },
+    "docs": {
+      "description": "Changes related to documentation"
+    },
+    "ui": {
+      "description": "Changes related to the user interface"
+    },
+    "ux": {
+      "description": "Changes related to the user experience"
+    },
+    "build": {
+      "description": "Changes related to the build system"
+    },
+    "ci": {
+      "description": "Changes related to continuous integration"
+    },
+    "deps": {
+      "description": "Changes related to dependencies"
+    },
+    "promotion": {
+      "description": "Kargo promotion changes"
+    },
+    "base": {
+      "description": "Changes related to the core functionality"
+    },
+    "release": {
+      "description": "A release commit"
+    }
+  },
+  "footerTypes": {
+    "BREAKING-CHANGE": {
+      "description": "The commit introduces breaking changes"
+    },
+    "Closes": {
+      "description": "The commit closes issues or pull requests"
+    },
+    "Implements": {
+      "description": "The commit implements new features"
+    },
+    "Author": {
+      "description": "The commit's author"
+    },
+    "Co-authored-by": {
+      "description": "The specified person co-authored the commit's changes"
+    },
+    "Signed-off-by": {
+      "description": "Certifies the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin"
+    },
+    "Reviewed-by": {
+      "description": "The specified person reviewed and is completely satisfied with the commit's changes"
+    },
+    "Tested-by": {
+      "description": "The specified person applied the commit's changes and found them to have the desired effect"
+    },
+    "Acked-by": {
+      "description": "The specified person liked the commit's changes"
+    },
+    "Refs": {
+      "description": "The commit references another commit by its hash ID.<br>For multiple hash IDs, use a comma as separator"
+    }
+  }
+}
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/knockoutwhistweb/app/assets/stylesheets/dark-mode.less
+++ b/knockoutwhistweb/app/assets/stylesheets/dark-mode.less
@@ -0,0 +1,14 @@
+@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);
+  }
+}
--- a/knockoutwhistweb/app/assets/stylesheets/light-mode.less
+++ b/knockoutwhistweb/app/assets/stylesheets/light-mode.less
@@ -0,0 +1,6 @@
+: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
@@ -0,0 +1,35 @@
+.login-box {
+  position: fixed; /* changed from absolute to fixed so it centers relative to the viewport */
+  align-items: center;
+  justify-content: center;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%); /* center exactly */
+  display: flex;
+  width: 100%;
+  max-width: 420px; /* keeps box from stretching too wide */
+  padding: 1rem;
+  z-index: 2; /* above particles */
+}
+
+.login-card {
+  max-width: 400px;
+  width: 100%;
+  border: none;
+  border-radius: 1rem;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 3; /* ensure card sits above the particles */
+}
+
+#particles-js {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0; /* behind content */
+  pointer-events: none; /* allow clicks through particles */
+  background-repeat: no-repeat;
+  background-size: cover;
+}
--- a/knockoutwhistweb/app/assets/stylesheets/main.less
+++ b/knockoutwhistweb/app/assets/stylesheets/main.less
@@ -0,0 +1,296 @@
+@import "light-mode.less";
+@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);
+  }
+}
+
+.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 */
+}
+
+.game-field {
+  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;
+  }
+}
+
+#textanimation {
+  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;
+}
+
+#ingame {
+  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;
+}
+
+.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;
+    }
+  }
+}
+
+#playedcardplayer {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+#playedcardplayer p {
+  font-size: 12px;
+  height: 4%;
+}
+
+#playedcardplayer img {
+  height: 90%;
+}
+
+#firstCard {
+  display: flex;
+  flex-direction: row;
+  height: 20%;
+  width: 100%;
+  justify-content: space-between;
+}
+
+#firstCardObject {
+  display: flex;
+  flex-direction: column;
+  margin-right: 4%;
+}
+
+#firstCardObject img {
+  height: 90%;
+}
+
+#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;
+  }
+}
+
+#selecttrumpsuit {
+  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%);
+  }
+}
--- a/knockoutwhistweb/app/auth/AuthAction.scala
+++ b/knockoutwhistweb/app/auth/AuthAction.scala
@@ -0,0 +1,37 @@
+package auth
+
+import controllers.routes
+import logic.user.SessionManager
+import model.users.User
+import play.api.mvc.*
+
+import javax.inject.Inject
+import scala.concurrent.{ExecutionContext, Future}
+
+class AuthenticatedRequest[A](val user: User, request: Request[A]) extends WrappedRequest[A](request)
+
+class AuthAction @Inject()(val sessionManager: SessionManager, val parser: BodyParsers.Default)(implicit ec: ExecutionContext)
+  extends ActionBuilder[AuthenticatedRequest, AnyContent] {
+
+  override def executionContext: ExecutionContext = ec
+
+  override def invokeBlock[A](
+                               request: Request[A],
+                               block: AuthenticatedRequest[A] => Future[Result]
+                             ): Future[Result] = {
+    getUserFromSession(request) match {
+      case Some(user) =>
+        block(new AuthenticatedRequest(user, request))
+      case None =>
+        Future.successful(Results.Unauthorized)
+    }
+  }
+
+  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
@@ -1,13 +1,14 @@
 package components

 import de.knockoutwhist.components.DefaultConfiguration
-import controllers.WebUI
 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] = super.uis + WebUI
-  override def listener: Set[EventListener] = super.listener + WebUI
+  override def uis: Set[UI] = Set()
+
+  override def listener: Set[EventListener] = Set(DelayHandler)

 }
--- a/knockoutwhistweb/app/controllers/HomeController.scala
+++ b/knockoutwhistweb/app/controllers/HomeController.scala
@@ -1,63 +0,0 @@
-package controllers
-
-import controllers.sessions.SimpleSession
-import com.google.inject.{Guice, Injector}
-import de.knockoutwhist.KnockOutWhist
-import de.knockoutwhist.components.Configuration
-import di.KnockOutWebConfigurationModule
-import play.api.*
-import play.api.mvc.*
-import play.twirl.api.Html
-
-import java.util.UUID
-import javax.inject.*
-
-
-/**
- * This controller creates an `Action` to handle HTTP requests to the
- * application's home page.
- */
-@Singleton
-class HomeController @Inject()(val controllerComponents: ControllerComponents) extends BaseController {
-
-  private var initial = false
-  private val injector: Injector = Guice.createInjector(KnockOutWebConfigurationModule())
-
-  /**
-   * Create an Action to render an HTML page.
-   *
-   * The configuration in the `routes` file means that this method
-   * will be called when the application receives a `GET` request with
-   * a path of `/`.
-   */
-  def index(): Action[AnyContent] = {
-    if (!initial) {
-      initial = true
-      KnockOutWhist.entry(injector.getInstance(classOf[Configuration]))
-    }
-    Action { implicit request =>
-      Redirect("/sessions")
-    }
-  }
-
-  def sessions(): Action[AnyContent] = {
-    Action { implicit request =>
-      Ok(views.html.sessions.apply(PodGameManager.listSessions().map(f => f.toString)))
-    }
-  }
-
-  def ingame(id: String): Action[AnyContent] = {
-    val uuid: UUID = UUID.fromString(id)
-    if (PodGameManager.identify(uuid).isEmpty) {
-      Action { implicit request =>
-        NotFound(views.html.tui.apply(List(Html(s"<p>Session with id $id not found!</p>"))))
-      }
-    } else {
-      val session = PodGameManager.identify(uuid).get
-      Action { implicit request =>
-        Ok(views.html.tui.apply(session.asInstanceOf[SimpleSession].get()))
-      }
-    }
-  }
-  
-}
--- a/knockoutwhistweb/app/controllers/IngameController.scala
+++ b/knockoutwhistweb/app/controllers/IngameController.scala
@@ -0,0 +1,444 @@
+package controllers
+
+import auth.{AuthAction, AuthenticatedRequest}
+import de.knockoutwhist.control.GameState
+import de.knockoutwhist.control.GameState.*
+import exceptions.*
+import logic.PodManager
+import logic.game.GameLobby
+import model.sessions.UserSession
+import model.users.User
+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
+
+@Singleton
+class IngameController @Inject()(
+                                  val cc: ControllerComponents,
+                                  val authAction: AuthAction,
+                                  implicit val ec: ExecutionContext
+                                ) extends AbstractController(cc) {
+
+  def game(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    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)
+        }
+      case None =>
+        Redirect(routes.MainMenuController.mainMenu())
+    }
+  }
+
+  def startGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = PodManager.getGame(gameId)
+    val result = Try {
+      game match {
+        case Some(g) =>
+          g.startGame(request.user)
+        case None =>
+          NotFound("Game not found")
+      }
+    }
+    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()
+      ))
+    } else {
+      val throwable = result.failed.get
+      throwable match {
+        case _: NotInThisGameException =>
+          BadRequest(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> throwable.getMessage
+          ))
+        case _: NotHostException =>
+          Forbidden(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> throwable.getMessage
+          ))
+        case _: NotEnoughPlayersException =>
+          BadRequest(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> throwable.getMessage
+          ))
+        case _ =>
+          InternalServerError(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> 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 leaveGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    val game = PodManager.getGame(gameId)
+    val result = Try {
+      game.get.leaveGame(request.user.id, false)
+    }
+    if (result.isSuccess) {
+      Ok(Json.obj(
+        "status" -> "success",
+        "redirectUrl" -> routes.MainMenuController.mainMenu().url,
+        "content" -> views.html.mainmenu.creategame(Some(request.user)).toString
+      ))
+    } else {
+      InternalServerError(Json.obj(
+        "status" -> "failure",
+        "errorMessage" -> "Something went wrong."
+      ))
+    }
+  }
+
+  def playCard(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] => {
+    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]
+        }
+        cardIdOpt match {
+          case Some(cardId) =>
+            var optSession: Option[UserSession] = None
+            val result = Try {
+              val session = g.getUserSession(request.user.id)
+              optSession = Some(session)
+              session.lock.lock()
+              g.playCard(session, cardId.toInt)
+            }
+            optSession.foreach(_.lock.unlock())
+            if (result.isSuccess) {
+              Ok(Json.obj(
+                "status" -> "success"
+              ))
+            } else {
+              val throwable = result.failed.get
+              throwable match {
+                case _: CantPlayCardException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                case _: NotInThisGameException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                case _: IllegalArgumentException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                case _: IllegalStateException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                case _: NotInteractableException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                case _ =>
+                  InternalServerError(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+              }
+            }
+          case None =>
+            BadRequest(Json.obj(
+              "status" -> "failure",
+              "errorMessage" -> "cardId Parameter is missing"
+            ))
+        }
+      case None =>
+        NotFound(Json.obj(
+          "status" -> "failure",
+          "errorMessage" -> "Game not found"
+        ))
+    }
+  }
+  }
+
+  def playDogCard(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] => {
+    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]
+        }
+        var optSession: Option[UserSession] = None
+        val result = Try {
+          cardIdOpt match {
+            case Some(cardId) if cardId == "skip" =>
+              val session = g.getUserSession(request.user.id)
+              optSession = Some(session)
+              session.lock.lock()
+              g.playDogCard(session, -1)
+            case Some(cardId) =>
+              val session = g.getUserSession(request.user.id)
+              optSession = Some(session)
+              session.lock.lock()
+              g.playDogCard(session, cardId.toInt)
+            case None =>
+              throw new IllegalArgumentException("cardId parameter is missing")
+          }
+        }
+        optSession.foreach(_.lock.unlock())
+        if (result.isSuccess) {
+          NoContent
+        } else {
+          val throwable = result.failed.get
+          throwable match {
+            case _: CantPlayCardException =>
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+            case _: NotInThisGameException =>
+              BadRequest(Json.obj(
+                "status" -> "failure",
+                "errorMessage" -> throwable.getMessage
+              ))
+            case _: IllegalArgumentException =>
+              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("Game not found")
+    }
+  }
+  }
+
+  def playTrump(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    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]
+        }
+        trumpOpt match {
+          case Some(trump) =>
+            var optSession: Option[UserSession] = None
+            val result = Try {
+              val session = g.getUserSession(request.user.id)
+              optSession = Some(session)
+              session.lock.lock()
+              g.selectTrump(session, trump.toInt)
+            }
+            optSession.foreach(_.lock.unlock())
+            if (result.isSuccess) {
+              NoContent
+            } else {
+              val throwable = result.failed.get
+              throwable match {
+                case _: IllegalArgumentException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                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 =>
+            BadRequest("trump parameter is missing")
+        }
+      case None =>
+        NotFound("Game not found")
+    }
+  }
+
+  def playTie(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    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]
+        }
+        tieOpt match {
+          case Some(tie) =>
+            var optSession: Option[UserSession] = None
+            val result = Try {
+              val session = g.getUserSession(request.user.id)
+              optSession = Some(session)
+              session.lock.lock()
+              g.selectTie(g.getUserSession(request.user.id), tie.toInt)
+            }
+            optSession.foreach(_.lock.unlock())
+            if (result.isSuccess) {
+              NoContent
+            } else {
+              val throwable = result.failed.get
+              throwable match {
+                case _: IllegalArgumentException =>
+                  BadRequest(Json.obj(
+                    "status" -> "failure",
+                    "errorMessage" -> throwable.getMessage
+                  ))
+                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 =>
+            BadRequest("tie parameter is missing")
+        }
+      case None =>
+        NotFound("Game not found")
+    }
+  }
+
+
+  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
@@ -0,0 +1,24 @@
+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
@@ -0,0 +1,113 @@
+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.*
+
+
+/**
+ * This controller creates an `Action` to handle HTTP requests to the
+ * application's home page.
+ */
+@Singleton
+class MainMenuController @Inject()(
+                                    val controllerComponents: ControllerComponents,
+                                    val authAction: AuthAction
+                                  ) 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))))
+  }
+
+  def index(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+    Redirect(routes.MainMenuController.mainMenu())
+  }
+
+  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(
+        host = request.user,
+        name = gamename,
+        maxPlayers = playeramount.toInt
+      )
+      Ok(Json.obj(
+        "status" -> "success",
+        "gameId" -> gameLobby.id,
+      ))
+    } else {
+      BadRequest(Json.obj(
+        "status" -> "failure",
+        "errorMessage" -> "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)
+      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
+          ))
+        case None =>
+          NotFound(Json.obj(
+            "status" -> "failure",
+            "errorMessage" -> "No Game found"
+          ))
+      }
+    } else {
+      BadRequest(Json.obj(
+        "status" -> "failure",
+        "errorMessage" -> "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"
+        ))
+    }
+  }
+
+}
--- a/knockoutwhistweb/app/controllers/PodGameManager.scala
+++ b/knockoutwhistweb/app/controllers/PodGameManager.scala
@@ -1,37 +0,0 @@
-package controllers
-
-import controllers.sessions.PlayerSession
-import de.knockoutwhist.utils.events.SimpleEvent
-
-import java.util.UUID
-import scala.collection.mutable
-
-object PodGameManager {
-  
-  private val sessions: mutable.Map[UUID, PlayerSession] = mutable.Map()
-  
-  def addSession(session: PlayerSession): Unit = {
-    sessions.put(session.id, session)
-  }
-  
-  def clearSessions(): Unit = {
-    sessions.clear()
-  }
-  
-  def identify(id: UUID): Option[PlayerSession] = {
-    sessions.get(id)
-  }
-  
-  def transmit(id: UUID, event: SimpleEvent): Unit = {
-    identify(id).foreach(_.updatePlayer(event))
-  }
-  
-  def transmitAll(event: SimpleEvent): Unit = {
-    sessions.foreach(session => session._2.updatePlayer(event))
-  }
-  
-  def listSessions(): List[UUID] = {
-    sessions.keys.toList
-  }
-
-}
--- a/knockoutwhistweb/app/controllers/StatusController.scala
+++ b/knockoutwhistweb/app/controllers/StatusController.scala
@@ -0,0 +1,94 @@
+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
@@ -0,0 +1,77 @@
+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.*
+
+
+/**
+ * This controller creates an `Action` to handle HTTP requests to the
+ * application's home page.
+ */
+@Singleton
+class UserController @Inject()(
+                                val controllerComponents: ControllerComponents,
+                                val sessionManager: SessionManager,
+                                val userManager: UserManager,
+                                val authAction: AuthAction
+                              ) extends BaseController {
+
+  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) {
+        // Extract username and password from form data
+        val possibleUser = userManager.authenticate(username.get, password.get)
+        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)
+          ))
+        } else {
+          Unauthorized("Invalid username or password")
+        }
+      } else {
+        BadRequest("Invalid form submission")
+      }
+    }
+  }
+  
+  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")
+    if (sessionCookie.isDefined) {
+      sessionManager.invalidateSession(sessionCookie.get.value)
+    }
+    NoContent.discardingCookies(DiscardingCookie("accessToken"))
+  }
+
+}
--- a/knockoutwhistweb/app/controllers/WebUI.scala
+++ b/knockoutwhistweb/app/controllers/WebUI.scala
@@ -1,77 +0,0 @@
-package controllers
-
-import controllers.sessions.SimpleSession
-import de.knockoutwhist.cards.{Card, CardValue, Hand, Suit}
-import de.knockoutwhist.events.*
-import de.knockoutwhist.events.ERROR_STATUS.*
-import de.knockoutwhist.events.GLOBAL_STATUS.*
-import de.knockoutwhist.events.PLAYER_STATUS.*
-import de.knockoutwhist.events.ROUND_STATUS.{PLAYERS_OUT, SHOW_START_ROUND, WON_ROUND}
-import de.knockoutwhist.events.cards.{RenderHandEvent, ShowTieCardsEvent}
-import de.knockoutwhist.events.round.ShowCurrentTrickEvent
-import de.knockoutwhist.events.ui.GameState.{INGAME, MAIN_MENU}
-import de.knockoutwhist.events.ui.{GameState, GameStateUpdateEvent}
-import de.knockoutwhist.player.AbstractPlayer
-import de.knockoutwhist.rounds.Match
-import de.knockoutwhist.ui.UI
-import de.knockoutwhist.utils.CustomThread
-import de.knockoutwhist.utils.events.{EventListener, SimpleEvent}
-
-object WebUI extends CustomThread with EventListener with UI {
-
-  setName("WebUI")
-  
-  var init = false
-  private var internState: GameState = GameState.NO_SET
-
-  var latestOutput: String = ""
-
-  override def instance: CustomThread = WebUI
-
-  override def listen(event: SimpleEvent): Unit = {
-    runLater {
-      event match {
-        case event: RenderHandEvent =>
-          PodGameManager.transmit(event.player.id, event)
-        case event: ShowTieCardsEvent =>
-          PodGameManager.transmitAll(event)
-        case event: ShowGlobalStatus =>
-          if (event.status == TECHNICAL_MATCH_STARTED) {
-            val matchImpl = event.objects.head.asInstanceOf[Match]
-            for (player <- matchImpl.totalplayers) {
-              PodGameManager.addSession(SimpleSession(player.id, List()))
-            }
-          } else {
-            PodGameManager.transmitAll(event)
-          }
-        case event: ShowPlayerStatus =>
-          PodGameManager.transmit(event.player.id, event)
-        case event: ShowRoundStatus =>
-          PodGameManager.transmitAll(event)
-        case event: ShowErrorStatus =>
-          PodGameManager.transmitAll(event)
-        case event: ShowCurrentTrickEvent =>
-          PodGameManager.transmitAll(event)
-        case event: GameStateUpdateEvent =>
-          if (internState != event.gameState) {
-            internState = event.gameState
-            if (event.gameState == MAIN_MENU) {
-              PodGameManager.clearSessions()
-            }
-            Some(true)
-          }
-        case _ => None
-      }
-    }
-  }
-
-  override def initial: Boolean = {
-    if (init) {
-      return false
-    }
-    init = true
-    start()
-    true
-  }
-  
-}
--- a/knockoutwhistweb/app/controllers/WebsocketController.scala
+++ b/knockoutwhistweb/app/controllers/WebsocketController.scala
@@ -0,0 +1,45 @@
+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/controllers/sessions/SimpleSession.scala
+++ b/knockoutwhistweb/app/controllers/sessions/SimpleSession.scala
@@ -1,260 +0,0 @@
-package controllers.sessions
-
-import de.knockoutwhist.cards.{Card, CardValue, Hand}
-import de.knockoutwhist.events.ERROR_STATUS.*
-import de.knockoutwhist.events.GLOBAL_STATUS.*
-import de.knockoutwhist.events.PLAYER_STATUS.*
-import de.knockoutwhist.events.ROUND_STATUS.*
-import de.knockoutwhist.events.{ShowErrorStatus, ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
-import de.knockoutwhist.events.cards.{RenderHandEvent, ShowTieCardsEvent}
-import de.knockoutwhist.events.round.ShowCurrentTrickEvent
-import de.knockoutwhist.player.AbstractPlayer
-import de.knockoutwhist.utils.events.SimpleEvent
-import play.twirl.api.Html
-import scalafx.scene.image.Image
-import util.WebUIUtils
-
-import java.util.UUID
-
-case class SimpleSession(id: UUID, private var output: List[Html]) extends PlayerSession {
-  def get(): List[Html] = {
-    output
-  }
-
-  override def updatePlayer(event: SimpleEvent): Unit = {
-    event match {
-      case event: RenderHandEvent =>
-        renderHand(event)
-      case event: ShowTieCardsEvent =>
-        showtiecardseventmethod(event)
-      case event: ShowGlobalStatus =>
-        showglobalstatusmethod(event)
-      case event: ShowPlayerStatus =>
-        showplayerstatusmethod(event)
-      case event: ShowRoundStatus =>
-        showroundstatusmethod(event)
-      case event: ShowErrorStatus =>
-        showerrstatmet(event)
-      case event: ShowCurrentTrickEvent =>
-        showcurtrevmet(event)
-    }
-  }
-
-  private def clear(): Unit = {
-    output = List()
-  }
-
-  private def renderHand(event: RenderHandEvent): Unit = {
-    output = output :++ WebUICards.renderHandEvent(event.hand)
-    output = output :+ Html("<br>")
-  }
-
-  private def showtiecardseventmethod(event: ShowTieCardsEvent): Option[Boolean] = {
-    var l = List[Html]()
-    for ((player, card) <- event.card) {
-      l = l :+ Html(s"<p>${player.name}:</p>")
-      l = l :+ WebUIUtils.cardtoImage(card)
-      l = l :+ Html("<br>")
-    }
-    output = output :++ l
-    output = output :+ Html("<br>")
-    Some(true)
-  }
-
-  private def showglobalstatusmethod(event: ShowGlobalStatus): Option[Boolean] = {
-    event.status match {
-      case SHOW_TIE =>
-        println("It's a tie! Let's cut to determine the winner.")
-        Some(true)
-      case SHOW_TIE_WINNER =>
-        if (event.objects.length != 1 || !event.objects.head.isInstanceOf[AbstractPlayer]) {
-          None
-        } else {
-          println(s"${event.objects.head.asInstanceOf[AbstractPlayer].name} wins the cut!")
-          Some(true)
-        }
-      case SHOW_TIE_TIE =>
-        println("It's a tie again! Let's cut again.")
-        Some(true)
-      case SHOW_START_MATCH =>
-        clear()
-        println("Starting a new match...")
-        output = output :+ Html("<br><br>")
-        Some(true)
-      case SHOW_TYPE_PLAYERS =>
-        println("Please enter the names of the players, separated by a comma.")
-        Some(true)
-      case SHOW_FINISHED_MATCH =>
-        if (event.objects.length != 1 || !event.objects.head.isInstanceOf[AbstractPlayer]) {
-          None
-        } else {
-          clear()
-          println(s"The match is over. The winner is ${event.objects.head.asInstanceOf[AbstractPlayer]}")
-          Some(true)
-        }
-    }
-  }
-
-  private def showplayerstatusmethod(event: ShowPlayerStatus): Option[Boolean] = {
-    val player = event.player
-    event.status match {
-      case SHOW_PLAY_CARD =>
-        println("Which card do you want to play?")
-        Some(true)
-      case SHOW_DOG_PLAY_CARD =>
-        if (event.objects.length != 1 || !event.objects.head.isInstanceOf[Boolean]) {
-          None
-        } else {
-          println("You are using your dog life. Do you want to play your final card now?")
-          if (event.objects.head.asInstanceOf[Boolean]) {
-            println("You have to play your final card this round!")
-            println("Please enter y to play your final card.")
-            Some(true)
-          } else {
-            println("Please enter y/n to play your final card.")
-            Some(true)
-          }
-        }
-      case SHOW_TIE_NUMBERS =>
-        if (event.objects.length != 1 || !event.objects.head.isInstanceOf[Int]) {
-          None
-        } else {
-          println(s"${player.name} enter a number between 1 and ${event.objects.head.asInstanceOf[Int]}.")
-          Some(true)
-        }
-      case SHOW_TRUMPSUIT_OPTIONS =>
-        println("Which suit do you want to pick as the next trump suit?")
-        println("1: Hearts")
-        println("2: Diamonds")
-        println("3: Clubs")
-        println("4: Spades")
-        println()
-        Some(true)
-      case SHOW_NOT_PLAYED =>
-        println(s"Player ${event.player} decided to not play his card")
-        Some(true)
-      case SHOW_WON_PLAYER_TRICK =>
-        println(s"${event.player.name} won the trick.")
-        output = output :+ Html("<br><br>")
-        Some(true)
-    }
-  }
-
-  private def showroundstatusmethod(event: ShowRoundStatus): Option[Boolean] = {
-    event.status match {
-      case SHOW_TURN =>
-        if (event.objects.length != 1 || !event.objects.head.isInstanceOf[AbstractPlayer]) {
-          None
-        } else {
-          println(s"It's ${event.objects.head.asInstanceOf[AbstractPlayer].name} turn.")
-          Some(true)
-        }
-      case SHOW_START_ROUND =>
-        clear()
-        println(s"Starting a new round. The trump suit is ${event.currentRound.trumpSuit}.")
-        output = output :+ Html("<br><br>")
-        Some(true)
-      case WON_ROUND =>
-        if (event.objects.length != 1 || !event.objects.head.isInstanceOf[AbstractPlayer]) {
-          None
-        } else {
-          println(s"${event.objects.head.asInstanceOf[AbstractPlayer].name} won the round.")
-          Some(true)
-        }
-      case PLAYERS_OUT =>
-        println("The following players are out of the game:")
-        event.currentRound.playersout.foreach(p => {
-          println(p.name)
-        })
-        Some(true)
-    }
-  }
-
-  private def showerrstatmet(event: ShowErrorStatus): Option[Boolean] = {
-    event.status match {
-      case INVALID_NUMBER =>
-        println("Please enter a valid number.")
-        Some(true)
-      case NOT_A_NUMBER =>
-        println("Please enter a number.")
-        Some(true)
-      case INVALID_INPUT =>
-        println("Please enter a valid input")
-        Some(true)
-      case INVALID_NUMBER_OF_PLAYERS =>
-        println("Please enter at least two names.")
-        Some(true)
-      case IDENTICAL_NAMES =>
-        println("Please enter unique names.")
-        Some(true)
-      case INVALID_NAME_FORMAT =>
-        println("Please enter valid names. Those can not be empty, shorter than 2 or longer then 10 characters.")
-        Some(true)
-      case WRONG_CARD =>
-        if (event.objects.length != 1 || !event.objects.head.isInstanceOf[Card]) {
-          None
-        } else {
-          println(f"You have to play a card of suit: ${event.objects.head.asInstanceOf[Card].suit}\n")
-          Some(true)
-        }
-    }
-  }
-
-  private def showcurtrevmet(event: ShowCurrentTrickEvent): Option[Boolean] = {
-    clear()
-    val sb = new StringBuilder()
-    sb.append("Current Trick:\n")
-    sb.append("Trump-Suit: " + event.round.trumpSuit + "\n")
-    if (event.trick.firstCard.isDefined) {
-      sb.append(s"Suit to play: ${event.trick.firstCard.get.suit}\n")
-    }
-    for ((card, player) <- event.trick.cards) {
-      sb.append(s"${player.name} played ${card.toString}\n")
-    }
-    println(sb.toString())
-    Some(true)
-  }
-
-  private def println(s: String): Unit = {
-    var html = List[Html]()
-    for (line <- s.split("\n")) {
-      html = html :+ Html(line)
-      html = html :+ Html("<br>")
-    }
-    output = output :++ html
-  }
-
-  private def println(): Unit = {
-    output = output :+ Html("<br>")
-  }
-
-  object WebUICards {
-    def renderCardAsString(card: Card): Vector[String] = {
-      val lines = "│         │"
-      if (card.cardValue == CardValue.Ten) {
-        return Vector(
-          s"┌─────────┐",
-          s"│${card.cardValue.cardType()}       │",
-          lines,
-          s"│    ${card.suit.cardType()}    │",
-          lines,
-          s"│       ${card.cardValue.cardType()}│",
-          s"└─────────┘"
-        )
-      }
-      Vector(
-        s"┌─────────┐",
-        s"│${card.cardValue.cardType()}        │",
-        lines,
-        s"│    ${card.suit.cardType()}    │",
-        lines,
-        s"│        ${card.cardValue.cardType()}│",
-        s"└─────────┘"
-      )
-    }
-
-    def renderHandEvent(hand: Hand): List[Html] = {
-      hand.cards.map(WebUIUtils.cardtoImage)
-    }
-  }
-}
--- a/knockoutwhistweb/app/dto/GameInfoDTO.scala
+++ b/knockoutwhistweb/app/dto/GameInfoDTO.scala
@@ -0,0 +1,35 @@
+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
@@ -0,0 +1,22 @@
+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
@@ -0,0 +1,27 @@
+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
@@ -0,0 +1,31 @@
+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
@@ -0,0 +1,34 @@
+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
@@ -0,0 +1,31 @@
+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
@@ -0,0 +1,15 @@
+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
@@ -0,0 +1,17 @@
+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
@@ -0,0 +1,19 @@
+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
@@ -0,0 +1,47 @@
+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
@@ -0,0 +1,20 @@
+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
@@ -0,0 +1,17 @@
+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
@@ -0,0 +1,17 @@
+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
@@ -0,0 +1,9 @@
+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
@@ -0,0 +1,9 @@
+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
@@ -0,0 +1,9 @@
+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
@@ -0,0 +1,12 @@
+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/exceptions/CantPlayCardException.java
+++ b/knockoutwhistweb/app/exceptions/CantPlayCardException.java
@@ -0,0 +1,7 @@
+package exceptions;
+
+public class CantPlayCardException extends GameException {
+    public CantPlayCardException(String message) {
+        super(message);
+    }
+}
--- a/knockoutwhistweb/app/exceptions/GameException.java
+++ b/knockoutwhistweb/app/exceptions/GameException.java
@@ -0,0 +1,7 @@
+package exceptions;
+
+public abstract class GameException extends RuntimeException {
+    public GameException(String message) {
+        super(message);
+    }
+}
--- a/knockoutwhistweb/app/exceptions/GameFullException.java
+++ b/knockoutwhistweb/app/exceptions/GameFullException.java
@@ -0,0 +1,7 @@
+package exceptions;
+
+public class GameFullException extends GameException {
+    public GameFullException(String message) {
+        super(message);
+    }
+}
--- a/knockoutwhistweb/app/exceptions/NotEnoughPlayersException.java
+++ b/knockoutwhistweb/app/exceptions/NotEnoughPlayersException.java
@@ -0,0 +1,7 @@
+package exceptions;
+
+public class NotEnoughPlayersException extends GameException {
+    public NotEnoughPlayersException(String message) {
+        super(message);
+    }
+}
--- a/knockoutwhistweb/app/exceptions/NotHostException.java
+++ b/knockoutwhistweb/app/exceptions/NotHostException.java
@@ -0,0 +1,7 @@
+package exceptions;
+
+public class NotHostException extends GameException {
+    public NotHostException(String message) {
+        super(message);
+    }
+}
--- a/knockoutwhistweb/app/exceptions/NotInThisGameException.java
+++ b/knockoutwhistweb/app/exceptions/NotInThisGameException.java
@@ -0,0 +1,7 @@
+package exceptions;
+
+public class NotInThisGameException extends GameException {
+    public NotInThisGameException(String message) {
+        super(message);
+    }
+}
--- a/knockoutwhistweb/app/exceptions/NotInteractableException.java
+++ b/knockoutwhistweb/app/exceptions/NotInteractableException.java
@@ -0,0 +1,7 @@
+package exceptions;
+
+public class NotInteractableException extends GameException {
+    public NotInteractableException(String message) {
+        super(message);
+    }
+}
--- a/knockoutwhistweb/app/logic/PodManager.scala
+++ b/knockoutwhistweb/app/logic/PodManager.scala
@@ -0,0 +1,73 @@
+package logic
+
+import com.google.inject.{Guice, Injector}
+import de.knockoutwhist.components.Configuration
+import de.knockoutwhist.control.controllerBaseImpl.BaseGameLogic
+import di.KnockOutWebConfigurationModule
+import logic.game.GameLobby
+import model.users.User
+import util.GameUtil
+
+import javax.inject.Singleton
+import scala.collection.mutable
+
+object 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())
+
+  def createGame(
+                  host: User,
+                  name: String,
+                  maxPlayers: Int
+                ): GameLobby = {
+    val gameLobby = GameLobby(
+      logic = BaseGameLogic(injector.getInstance(classOf[Configuration])),
+      id = GameUtil.generateCode(),
+      internalId = java.util.UUID.randomUUID(),
+      name = name,
+      maxPlayers = maxPlayers,
+      host = host
+    )
+    sessions += (gameLobby.id -> gameLobby)
+    userSession += (host -> gameLobby.id)
+    gameLobby
+  }
+
+  def getGame(gameId: String): Option[GameLobby] = {
+    sessions.get(gameId)
+  }
+
+  def registerUserToGame(user: User, gameId: String): Boolean = {
+    if (sessions.contains(gameId)) {
+      userSession += (user -> gameId)
+      true
+    } else {
+      false
+    }
+  }
+
+  def unregisterUserFromGame(user: User): Unit = {
+    userSession.remove(user)
+  }
+
+  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)
+    // Also remove all user sessions associated with this game
+    userSession.filterInPlace((_, v) => v != gameId)
+  }
+
+
+}
--- a/knockoutwhistweb/app/logic/game/GameLobby.scala
+++ b/knockoutwhistweb/app/logic/game/GameLobby.scala
@@ -0,0 +1,344 @@
+package logic.game
+
+import de.knockoutwhist.cards.{Hand, Suit}
+import de.knockoutwhist.control.GameLogic
+import de.knockoutwhist.control.GameState.{Lobby, MainMenu}
+import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.{MatchUtil, PlayerUtil}
+import de.knockoutwhist.events.global.{GameStateChangeEvent, SessionClosed}
+import de.knockoutwhist.events.player.PlayerEvent
+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 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()
+  logic.addListener(this)
+  logic.createSession()
+
+  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
+    )
+    users += (user.id -> userSession)
+    PodManager.registerUserToGame(user, id)
+    logic.invoke(LobbyUpdateEvent())
+    userSession
+  }
+
+  override def listen(event: SimpleEvent): Unit = {
+    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: SimpleEvent =>
+        users.values.foreach(session => session.updatePlayer(event))
+    }
+  }
+
+  /**
+   * Start the game if the user is the host.
+   *
+   * @param user the user who wants to start the game.
+   */
+  def startGame(user: User): Unit = {
+    val sessionOpt = users.get(user.id)
+    if (sessionOpt.isEmpty) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    if (!sessionOpt.get.host) {
+      throw new NotHostException("Only the host can start the game!")
+    }
+    if (logic.getCurrentState != Lobby) {
+      throw new IllegalStateException("The game has already started!")
+    }
+    val playerNamesList = ListBuffer[AbstractPlayer]()
+    users.values.foreach { player =>
+      playerNamesList += PlayerFactory.createPlayer(player.name, player.id, HUMAN)
+    }
+    if (playerNamesList.size < 2) {
+      throw new NotEnoughPlayersException("Not enough players to start the game!")
+    }
+    logic.createMatch(playerNamesList.toList)
+    logic.controlMatch()
+  }
+
+  /**
+   * 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 = {
+    val sessionOpt = users.get(userId)
+    if (sessionOpt.isEmpty) {
+      throw new NotInThisGameException("You are not in this game!")
+    }
+    if (sessionOpt.get.host) {
+      logic.invoke(SessionClosed())
+      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.
+   */
+  def playCard(userSession: UserSession, cardIndex: Int): Unit = {
+    val player = getPlayerInteractable(userSession, InteractionType.Card)
+    if (player.isInDogLife) {
+      throw new CantPlayCardException("You are in dog life!")
+    }
+    val hand = getHand(player)
+    val card = hand.cards(cardIndex)
+    if (!PlayerUtil.canPlayCard(card, getRound, getTrick, player)) {
+      throw new CantPlayCardException("You can't play this card!")
+    }
+    userSession.resetCanInteract()
+    logic.playerInputLogic.receivedCard(card)
+  }
+
+  private def getHand(player: AbstractPlayer): Hand = {
+    val handOption = player.currentHand()
+    if (handOption.isEmpty) {
+      throw new IllegalStateException("You have no cards!")
+    }
+    handOption.get
+  }
+
+  private def getRound: Round = {
+    val roundOpt = logic.getCurrentRound
+    if (roundOpt.isEmpty) {
+      throw new IllegalStateException("No round is currently running!")
+    }
+    roundOpt.get
+  }
+
+  private def getTrick: Trick = {
+    val trickOpt = logic.getCurrentTrick
+    if (trickOpt.isEmpty) {
+      throw new IllegalStateException("No trick is currently running!")
+    }
+    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 {
+  def apply(
+             logic: GameLogic,
+             id: String,
+             internalId: UUID,
+             name: String,
+             maxPlayers: Int,
+             host: User
+           ): GameLobby = {
+    val lobby = new GameLobby(
+      logic = logic,
+      id = id,
+      internalId = internalId,
+      name = name,
+      maxPlayers = maxPlayers
+    )
+    lobby.users += (host.id -> new UserSession(
+      user = host,
+      host = true,
+      gameLobby = lobby
+    ))
+    lobby
+  }
+}
--- a/knockoutwhistweb/app/logic/user/SessionManager.scala
+++ b/knockoutwhistweb/app/logic/user/SessionManager.scala
@@ -0,0 +1,17 @@
+package logic.user
+
+import com.google.inject.ImplementedBy
+import logic.user.impl.BaseSessionManager
+import model.users.User
+
+@ImplementedBy(classOf[BaseSessionManager])
+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
@@ -0,0 +1,20 @@
+package logic.user
+
+import com.google.inject.ImplementedBy
+import logic.user.impl.StubUserManager
+import model.users.User
+
+@ImplementedBy(classOf[StubUserManager])
+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
@@ -0,0 +1,70 @@
+package logic.user.impl
+
+import com.auth0.jwt.algorithms.Algorithm
+import com.auth0.jwt.{JWT, JWTVerifier}
+import com.github.benmanes.caffeine.cache.{Cache, Caffeine}
+import com.typesafe.config.Config
+import logic.user.SessionManager
+import model.users.User
+import scalafx.util.Duration
+import services.JwtKeyProvider
+
+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 {
+
+  private val algorithm = Algorithm.RSA512(keyProvider.publicKey, keyProvider.privateKey)
+  private val verifier: JWTVerifier = JWT.require(algorithm)
+    .withIssuer(config.getString("auth.issuer"))
+    .withAudience(config.getString("auth.audience"))
+    .build()
+
+  //TODO reduce cache to a minimum amount, as JWT should be self-contained
+  private val cache: Cache[String, User] = Caffeine.newBuilder()
+    .maximumSize(10_000)
+    .expireAfterWrite(5, TimeUnit.MINUTES).build()
+
+  override def createSession(user: User): String = {
+    //Write session identifier to cache and DB
+    val sessionId = JWT.create()
+      .withIssuer(config.getString("auth.issuer"))
+      .withAudience(config.getString("auth.audience"))
+      .withSubject(user.id.toString)
+      .withClaim("id", user.internalId)
+      .withExpiresAt(Instant.now.plus(7, ChronoUnit.DAYS))
+      .sign(algorithm)
+    //TODO write to Redis and DB
+    cache.put(sessionId, user)
+
+    sessionId
+  }
+
+  override def getUserBySession(sessionId: String): Option[User] = {
+    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
+      }
+    }
+  }
+
+  override def invalidateSession(sessionId: String): Unit = {
+    //TODO remove from Redis and DB
+    cache.invalidate(sessionId)
+  }
+}
--- a/knockoutwhistweb/app/logic/user/impl/StubUserManager.scala
+++ b/knockoutwhistweb/app/logic/user/impl/StubUserManager.scala
@@ -0,0 +1,57 @@
+package logic.user.impl
+
+import com.typesafe.config.Config
+import logic.user.UserManager
+import model.users.User
+import util.UserHash
+
+import javax.inject.{Inject, Singleton}
+
+@Singleton
+class StubUserManager @Inject()(val config: Config) extends UserManager {
+
+  private val user: Map[String, User] = Map(
+    "Janis" -> User(
+      internalId = 1L,
+      id = java.util.UUID.fromString("123e4567-e89b-12d3-a456-426614174000"),
+      name = "Janis",
+      passwordHash = UserHash.hashPW("password123")
+    ),
+    "Leon" -> User(
+      internalId = 2L,
+      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")
+    )
+  )
+
+  override def addUser(name: String, password: String): Boolean = {
+    throw new NotImplementedError("StubUserManager.addUser is not implemented")
+  }
+
+  override def authenticate(name: String, password: String): Option[User] = {
+    user.get(name) match {
+      case Some(u) if UserHash.verifyUser(password, u) => Some(u)
+      case _ => None
+    }
+  }
+
+  override def userExists(name: String): Option[User] = {
+    user.get(name)
+  }
+
+  override def userExistsById(id: Long): Option[User] = {
+    user.values.find(_.internalId == id)
+  }
+
+  override def removeUser(name: String): Boolean = {
+    throw new NotImplementedError("StubUserManager.removeUser is not implemented")
+  }
+
+}
--- a/knockoutwhistweb/app/model/sessions/InteractionType.scala
+++ b/knockoutwhistweb/app/model/sessions/InteractionType.scala
@@ -0,0 +1,10 @@
+package model.sessions
+
+enum InteractionType {
+
+  case TrumpSuit
+  case Card
+  case DogCard
+  case TieChoice
+
+}
--- a/knockoutwhistweb/app/controllers/sessions/PlayerSession.scala
+++ b/knockoutwhistweb/app/controllers/sessions/PlayerSession.scala
@@ -1,12 +1,15 @@
-package controllers.sessions
+package model.sessions

 import de.knockoutwhist.utils.events.SimpleEvent

 import java.util.UUID

 trait PlayerSession {
-  
+
  def id: UUID
+
+  def name: String
+
  def updatePlayer(event: SimpleEvent): Unit
-  
+
 }
--- a/knockoutwhistweb/app/model/sessions/SimpleSession.scala
+++ b/knockoutwhistweb/app/model/sessions/SimpleSession.scala
@@ -0,0 +1,14 @@
+package model.sessions
+
+import de.knockoutwhist.player.AbstractPlayer
+import de.knockoutwhist.utils.events.SimpleEvent
+
+import java.util.UUID
+
+case class SimpleSession(id: UUID, player: AbstractPlayer) extends PlayerSession {
+
+  def name: String = player.name
+
+  override def updatePlayer(event: SimpleEvent): Unit = {
+  }
+}
--- a/knockoutwhistweb/app/model/sessions/UserSession.scala
+++ b/knockoutwhistweb/app/model/sessions/UserSession.scala
@@ -0,0 +1,84 @@
+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
+
+class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) extends PlayerSession {
+  val lock: ReentrantLock = ReentrantLock()
+  var canInteract: Option[InteractionType] = None
+  var websocketActor: Option[UserWebsocketActor] = None
+
+  override def updatePlayer(event: SimpleEvent): Unit = {
+    event match {
+      case event: RequestTrumpSuitEvent =>
+        canInteract = Some(InteractionType.TrumpSuit)
+      case event: RequestTieChoiceEvent =>
+        canInteract = Some(InteractionType.TieChoice)
+      case event: RequestCardEvent =>
+        if (event.player.isInDogLife) canInteract = Some(InteractionType.DogCard)
+        else canInteract = Some(InteractionType.Card)
+      case _ =>
+    }
+    websocketActor.foreach(_.solveRequests())
+    websocketActor.foreach(_.transmitEventToClient(event))
+  }
+
+  override def id: UUID = user.id
+
+  override def name: String = user.name
+
+  def resetCanInteract(): Unit = {
+    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
@@ -0,0 +1,133 @@
+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
@@ -0,0 +1,20 @@
+package model.users
+
+
+import java.util.UUID
+
+case class User(
+                 internalId: Long,
+                 id: UUID,
+                 name: String,
+                 passwordHash: String
+               ) {
+
+  def withName(newName: String): User = {
+    this.copy(name = newName)
+  }
+
+  private def withPasswordHash(newPasswordHash: String): User = {
+    this.copy(passwordHash = newPasswordHash)
+  }
+}
--- a/knockoutwhistweb/app/services/JwtKeyProvider.scala
+++ b/knockoutwhistweb/app/services/JwtKeyProvider.scala
@@ -0,0 +1,55 @@
+package services
+
+import play.api.Configuration
+
+import java.nio.file.{Files, Paths}
+import java.security.interfaces.{RSAPrivateKey, RSAPublicKey}
+import java.security.spec.{PKCS8EncodedKeySpec, RSAPublicKeySpec, X509EncodedKeySpec}
+import java.security.{KeyFactory, KeyPair, PrivateKey, PublicKey}
+import java.util.Base64
+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 loadPublicKeyFromPem(pem: String): RSAPublicKey = {
+    val decoded = Base64.getDecoder.decode(cleanPem(pem))
+    val spec = new X509EncodedKeySpec(decoded)
+    KeyFactory.getInstance("RSA").generatePublic(spec).asInstanceOf[RSAPublicKey]
+  }
+
+  private def loadPrivateKeyFromPem(pem: String): RSAPrivateKey = {
+    val decoded = Base64.getDecoder.decode(cleanPem(pem))
+    val spec = new PKCS8EncodedKeySpec(decoded)
+    KeyFactory.getInstance("RSA").generatePrivate(spec).asInstanceOf[RSAPrivateKey]
+  }
+
+  private def cleanPem(pem: String): String =
+    pem.replaceAll("-----BEGIN (.*)-----", "")
+      .replaceAll("-----END (.*)-----", "")
+      .replaceAll("\\s", "")
+
+}
--- a/knockoutwhistweb/app/util/GameUtil.scala
+++ b/knockoutwhistweb/app/util/GameUtil.scala
@@ -0,0 +1,43 @@
+package util
+
+import de.knockoutwhist.control.GameState
+import de.knockoutwhist.control.GameState.{FinishedMatch, InGame, Lobby, MainMenu, SelectTrump, TieBreak}
+
+import scala.util.Random
+
+object GameUtil {
+
+  private val CharPool: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+  private val CodeLength: Int = 6
+  private val MaxRepetition: Int = 2
+  private val random = new Random()
+
+  def generateCode(): String = {
+    val freq = Array.fill(CharPool.length)(0)
+    val code = new StringBuilder(CodeLength)
+
+    for (_ <- 0 until CodeLength) {
+      var index = random.nextInt(CharPool.length)
+      // Pick a new character if it's already used twice
+      while (freq(index) >= MaxRepetition) {
+        index = random.nextInt(CharPool.length)
+      }
+      freq(index) += 1
+      code.append(CharPool.charAt(index))
+    }
+
+    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/UserHash.scala
+++ b/knockoutwhistweb/app/util/UserHash.scala
@@ -0,0 +1,23 @@
+package util
+
+import de.mkammerer.argon2.Argon2Factory
+import de.mkammerer.argon2.Argon2Factory.Argon2Types
+import model.users.User
+
+object UserHash {
+  private val ITERATIONS: Int = 3
+  private val MEMORY: Int = 32_768
+  private val PARALLELISM: Int = 1
+  private val SALT_LENGTH: Int = 32
+  private val HASH_LENGTH: Int = 64
+  private val ARGON_2 = Argon2Factory.create(Argon2Types.ARGON2id, SALT_LENGTH, HASH_LENGTH)
+
+  def hashPW(password: String): String = {
+    ARGON_2.hash(ITERATIONS, MEMORY, PARALLELISM, password.toCharArray)
+  }
+
+  def verifyUser(password: String, user: User): Boolean = {
+    ARGON_2.verify(user.passwordHash, password.toCharArray)
+  }
+
+}
--- a/knockoutwhistweb/app/util/WebUIUtils.scala
+++ b/knockoutwhistweb/app/util/WebUIUtils.scala
@@ -1,13 +1,22 @@
 package util

-import de.knockoutwhist.cards.Card
-import de.knockoutwhist.cards.CardValue.{Ace, Eight, Five, Four, Jack, King, Nine, Queen, Seven, Six, Ten, Three, Two}
+import de.knockoutwhist.cards.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"
@@ -29,6 +38,50 @@ object WebUIUtils {
      case Three => "3"
      case Two => "2"
    }
-    views.html.output.card.apply(f"images/cards/$cv$s.png")(card.toString)
+    f"$cv$s"
  }
+  
+  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
@@ -0,0 +1,77 @@
+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
@@ -0,0 +1,20 @@
+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
@@ -0,0 +1,19 @@
+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
@@ -0,0 +1,19 @@
+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
@@ -0,0 +1,19 @@
+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
@@ -0,0 +1,25 @@
+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
@@ -0,0 +1,18 @@
+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
@@ -0,0 +1,14 @@
+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
@@ -0,0 +1,17 @@
+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
@@ -0,0 +1,16 @@
+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
@@ -0,0 +1,20 @@
+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
@@ -0,0 +1,19 @@
+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
@@ -0,0 +1,13 @@
+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
@@ -0,0 +1,20 @@
+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
@@ -0,0 +1,35 @@
+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/index.scala.html
+++ b/knockoutwhistweb/app/views/index.scala.html
@@ -1,3 +0,0 @@
-@main("Welcome to Play") {
-  <h1>Welcome to Play!</h1>
-}
--- a/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
+++ b/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
@@ -0,0 +1,108 @@
+@(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
@@ -0,0 +1,42 @@
+@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>
+        </div>
+    </main>
+</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
@@ -0,0 +1,68 @@
+@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
+
+<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>
+        </div>
+    </div>
+</div>
+<script>
+    connectWebSocket()
+</script>
--- a/knockoutwhistweb/app/views/ingame/tie.scala.html
+++ b/knockoutwhistweb/app/views/ingame/tie.scala.html
@@ -0,0 +1,114 @@
+@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
+<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>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    connectWebSocket()
+</script>
--- a/knockoutwhistweb/app/views/lobby/lobby.scala.html
+++ b/knockoutwhistweb/app/views/lobby/lobby.scala.html
@@ -0,0 +1,38 @@
+@(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.
+
+    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
+            )
+        }
+        Json.stringify(Json.toJson(playerListForVue))
+    })');
+    connectWebSocket();
+    globalThis.initLobbyVueComponents(
+    initialLobbyName,
+    initialLobbyId,
+    initialIsHost,
+    initialMaxPlayers,
+    initialPlayers
+    );
+</script>
--- a/knockoutwhistweb/app/views/login/login.scala.html
+++ b/knockoutwhistweb/app/views/login/login.scala.html
@@ -0,0 +1,43 @@
+@()
+<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>
+
+                <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>
+<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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
TeamCity	c3d10f31ac	ci: bump version to v4.16.0	2025-12-18 08:51:00 +00:00
lq64	e4384ee894	feat(ui): FRO-36 PWA (#110 ) Added localhost:3000 to CORS for PWA to work Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #110 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-18 09:47:25 +01:00
TeamCity	d667a2f68c	ci: bump version to v4.15.0	2025-12-14 14:15:11 +00:00
Janis	35f608513d	feat: Update routing and websocket configuration for game state management (#109 ) Reviewed-on: #109	2025-12-14 15:10:43 +01:00
TeamCity	13038b0cb9	ci: bump version to v4.14.0	2025-12-11 06:13:24 +00:00
lq64	b17aae5795	feat: FRO-31 Small backend changes (#108 ) Force pushing Janis changes Co-authored-by: Janis <janis.e.20@gmx.de> Co-authored-by: Janis <janis-e@gmx.de> Reviewed-on: #108 Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-11 07:10:24 +01:00
TeamCity	421f769cb6	ci: bump version to v4.13.0	2025-12-10 14:19:44 +00:00
lq64	bd7a055a09	feat(api): FRO-14 Create Game (#107 ) Added functionality to create Game so that it creates a game in the Backend Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #107 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-10 15:16:53 +01:00
TeamCity	e2a2b56174	ci: bump version to v4.12.0	2025-12-10 13:15:50 +00:00
Janis	2a29ca8cdd	feat: FRO-20 Create scoreboard component (#106 ) Reviewed-on: #106 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-10 14:12:48 +01:00
TeamCity	266cbe7509	ci: bump version to v4.11.0	2025-12-10 10:47:18 +00:00
Janis	e8b31b1748	feat: FRO-2 Implement Login Component (#105 ) Reviewed-on: #105 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-10 11:43:51 +01:00
TeamCity	8812b0fad4	ci: bump version to v4.10.0	2025-12-10 10:40:36 +00:00
Janis	dd5e8e65e5	feat: BAC-27 Implemented endpoint which returns information about the current state (#103 ) Reviewed-on: #103 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-10 11:37:35 +01:00
TeamCity	bf6ffeadb0	ci: bump version to v4.9.1	2025-12-10 08:46:31 +00:00
Janis	fa3d21e303	fix: FRO-29 Websocket Communication (#104 ) Reviewed-on: #104 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-10 09:42:50 +01:00
TeamCity	33efc4e107	ci: bump version to v4.9.0	2025-12-06 09:19:38 +00:00
Janis	8d697fd311	feat: BAC-30 Implement Jackson Mapping via DTOs (#102 ) Reviewed-on: #102 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-06 10:17:04 +01:00
TeamCity	b9e60b5d4a	ci: bump version to v4.8.1	2025-12-05 18:27:14 +00:00
Janis	270f44cc1f	fix: BAC-29 Implement Mappers for Common Classes (#101 ) Reviewed-on: #101 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-05 19:24:10 +01:00
TeamCity	73dbe5826a	ci: bump version to v4.8.0	2025-12-04 07:03:34 +00:00
lq64	194df5691c	feat: FRO-3 FRO-4 Added vue compontents to ingame and lobby (#100 ) Added vue compontents to ingame and lobby. Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #100 Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-04 08:00:58 +01:00
TeamCity	49a1bd40ff	ci: bump version to v4.7.3	2025-12-04 01:32:05 +00:00
Janis	f847424b9c	fix: BAC-25 Race Condition: Websocket Promises (#99 ) Reviewed-on: #99 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-04 02:29:19 +01:00
TeamCity	d50a576e31	ci: bump version to v4.7.2	2025-12-03 11:17:48 +00:00
TeamCity	eba2ad6232	ci: bump version to v4.7.1	2025-12-03 09:22:04 +00:00
Janis	14961cce01	chore: BAC-17 Add knockoutwhistfrontend submodule (#98 ) Reviewed-on: #98 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-03 10:19:15 +01:00
TeamCity	dcb5d7373f	ci: bump version to v4.7.0	2025-12-03 08:20:51 +00:00
lq64	d57e6efa98	feat(ui): FRO-7 Endscreen (#97 ) Added a nice look to the endscreen. Implemented a ranking method inside GameLobby to get an order. Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #97 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-12-03 09:18:11 +01:00
TeamCity	4156e1c9ce	ci: bump version to v4.6.2	2025-12-01 20:21:02 +00:00
Janis	358556612e	fix: FRO-6 Websocket Close Handle (#96 ) Reviewed-on: #96 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-01 21:17:58 +01:00
TeamCity	7f82d2eeae	ci: bump version to v4.6.1	2025-12-01 19:44:13 +00:00
Janis	a55f0b4b61	fix(api): BAC-23 Remove old polling code (#95 ) Reviewed-on: #95 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-01 20:41:27 +01:00
TeamCity	f115c03ecb	ci: bump version to v4.6.0	2025-12-01 19:07:26 +00:00
Janis	fd2467a9ea	feat(api): BAC-11 Websocket - Return to Lobby (#94 ) Reviewed-on: #94 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-01 20:04:17 +01:00
TeamCity	9d3f3940a9	ci: bump version to v4.5.0	2025-12-01 18:53:23 +00:00
Janis	0541bb58d1	feat(api): BAC-10 Websockets - Kick Users (#93 ) Reviewed-on: #93 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-01 19:50:19 +01:00
TeamCity	89a6aa22f7	ci: bump version to v4.4.0	2025-12-01 18:18:44 +00:00
Janis	6e17328846	feat: GameState to Title Mapping BAC-1 (#92 ) Reviewed-on: #92 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-01 19:13:32 +01:00
Janis	0037820905	feat(ui): Popups (#91 ) Fixed sorting and added popups for trickend and roundend Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #91	2025-11-27 10:01:19 +01:00
Janis	cfcd967ce0	fix(api): fixes - reimplemented animations (#90 ) Reviewed-on: #90	2025-11-27 09:52:00 +01:00
Janis	1f96290371	feat(ui): Implement countless feature using the SJWP (#89 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #89	2025-11-27 08:53:37 +01:00
Janis	2aee79bb68	feat(api): Implemented turn event via websocket (#86 ) Co-authored-by: TeamCity <teamcity@service.local> Reviewed-on: #86 Reviewed-by: lq64 <lq@blackhole.local>	2025-11-27 07:57:37 +01:00
Janis	46c96d4ceb	fix(api): Fixed websocket routing (#88 ) Reviewed-on: #88 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-27 07:51:02 +01:00
TeamCity	14b4473f72	ci: bump version to v4.3.0	2025-11-26 17:44:23 +00:00
Janis	1ef5e8a72f	feat(api): Implemented session closed and kick event via websocket (#87 ) Reviewed-on: #87 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-26 18:41:25 +01:00
TeamCity	576e5af87e	ci: bump version to v4.2.0	2025-11-26 12:37:57 +00:00
Janis	3c0828fdbe	feat(api): Implemented card played event via websocket (#85 ) Reviewed-on: #85 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-26 13:35:05 +01:00
TeamCity	ae7f04abc3	ci: bump version to v4.1.0	2025-11-26 10:29:11 +00:00
Janis	b81bb3d0ae	feat(base): Fixed logic for websockets and added GameStateEvent. Might've caused instability on other feature branches! (#84 ) Reviewed-on: #84 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-26 11:26:08 +01:00
Janis	52e5033afc	feat(api): Implement received hand event handling and UI updates (#83 ) #76 Reviewed-on: #83	2025-11-24 14:31:31 +01:00
TeamCity	10a26404b3	ci: bump version to v4.0.1	2025-11-24 11:21:05 +00:00
TeamCity	11478a096d	ci: bump version to v4.0.0	2025-11-23 15:15:09 +00:00
Janis	8ca909db52	feat(websocket)!: Implement WebSocket connection and event handling (#82 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #82 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-23 16:11:46 +01:00
TeamCity	1edb3bfd89	ci: bump version to v3.0.1	2025-11-22 20:38:51 +00:00
Janis	9738a04b7a	fix(api): Fixed a bug where the game would reload on game start (#81 ) Reviewed-on: #81 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-22 21:36:23 +01:00
TeamCity	2bc50664e0	ci: bump version to v3.0.0	2025-11-20 15:31:03 +00:00
Janis	3e3a062a06	ci: bump version to v2.0.0	2025-11-20 16:27:39 +01:00
Janis	641c892981	fix(polling): Improve polling mechanism and delay handling (#60 ) Reviewed-on: #60	2025-11-20 10:51:39 +01:00
Janis	a58b2e03b1	feat(game)!: Fixed polling, SPA, Gameplayloop etc. (#59 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #59 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-19 22:54:20 +01:00
Janis	e60fe7c98d	feat(ci): Polling Added polling for when the game starts and a card gets played (#58 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #58	2025-11-14 09:11:32 +01:00
Janis	370de175db	feat(ci): Polling Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #53	2025-11-13 11:07:08 +01:00
Janis	5d245d0011	feat(ui): implement tie & trump menu, fixed some critical bugs (#52 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #52 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-13 08:20:30 +01:00
lq64	c220e54bb8	feat(ui): added js routing, updated ingame ui, added tricktable (#50 ) This merge request has full JS routing for calling specific endpoints. Game is fully playable but doesn't have polling yet. This version already has the UI changes adressed in MR #43 so first merge MR #43 and then this one or only merge this one because it already has the UI changes :) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #50 Reviewed-by: Janis <janis-e@gmx.de>	2025-11-12 11:44:21 +01:00
TeamCity	b847d3c054	ci: bump version to v1.0.9	2025-11-07 16:54:36 +00:00
Janis	c7dd72ecc2	fix: removed trailing	2025-11-07 17:52:12 +01:00
Janis	42a5adbae0	fix: removed trailing	2025-11-07 17:46:55 +01:00
TeamCity	ae9a8f2af9	ci: bump version to v1.0.8	2025-11-07 16:28:11 +00:00
Janis	7adc8b8645	fix: trailing	2025-11-07 17:25:35 +01:00
TeamCity	146348470f	ci: bump version to v1.0.7	2025-11-07 15:52:23 +00:00
Janis	5e503cbc36	fix: removed trailing	2025-11-07 16:49:51 +01:00
TeamCity	126e2030ae	ci: bump version to v1.0.6	2025-11-07 15:45:22 +00:00
Janis	54e3215127	fix: traling	2025-11-07 16:42:50 +01:00
TeamCity	72d2845772	ci: bump version to v1.0.5	2025-11-07 15:00:33 +00:00
Janis	64a7a63ab3	fix: removed trailing	2025-11-07 15:56:50 +01:00
TeamCity	51c36348b9	ci: bump version to v1.0.4	2025-11-07 14:47:49 +00:00
Janis	2e54880302	fix: changelog syntax	2025-11-07 15:45:31 +01:00
TeamCity	266406fe7c	ci: bump version to v1.0.3	2025-11-07 14:38:07 +00:00
Janis	5c6d3ac436	fix: ensure proper CMD syntax in Dockerfile (#48 ) Reviewed-on: #48 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-07 15:24:08 +01:00
TeamCity	674619dadc	ci: bump version to v1.0.2	2025-11-07 14:09:00 +00:00
TeamCity	ef539d3eea	ci: bump version to v1.0.1	2025-11-07 14:02:39 +00:00
TeamCity	e09463b138	ci: bump version to v1.0.0	2025-11-07 13:45:15 +00:00
Janis	4d6ea54771	feat(docker): added docker container support (#47 ) Reviewed-on: #47 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-07 14:22:23 +01:00
Janis	aa83082d09	fix: update allowed hosts filter and adjust background color in login page (#45 ) Reviewed-on: #45	2025-11-07 11:13:59 +01:00
Janis	42e7597e26	ci: revert setup (#44 ) Reviewed-on: #44	2025-11-07 11:05:49 +01:00
TeamCity	6befd9c722	ci: bump version to v.. [skip ci]	2025-11-07 09:58:59 +00:00
Janis	51d9c0b5f6	fix: disabled external node	2025-11-07 10:18:11 +01:00
Janis	de565b52dc	fix: update file paths and improve session handling in user interactions (#39 ) Reviewed-on: #39	2025-11-06 10:03:28 +01:00
Janis	051e7406e3	feat(ui): add Lobby and Main Menu Body (#38 ) Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #38 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-06 09:03:09 +01:00
Janis	44c88c8f60	fix: ensure proper unlocking of user session locks in game actions (#37 ) Reviewed-on: #37 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-05 11:31:45 +01:00
Janis	96c38466d2	fix: improve lock handling in user session interactions (#36 ) Reviewed-on: #36 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-05 11:19:37 +01:00
Janis	32d4f9c6ce	feat(ui): add main menu navbar and join game functionality (#35 ) Reviewed-on: #35 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-04 12:43:08 +01:00
TeamCity	5c1a5a661b	ci: bump version to v2.0.0 [skip ci]	2025-11-03 11:59:13 +00:00
TeamCity	7b97986df9	ci: bump version to v1.0.0 [skip ci]	2025-11-03 11:58:08 +00:00
Janis	7879d1ab6e	revert: version bump	2025-11-03 12:57:53 +01:00
TeamCity	1564956107	ci: bump version to v1.0.0 [skip ci]	2025-11-03 11:55:56 +00:00
Janis	2e10059a67	revert: version bumb	2025-11-03 11:53:17 +01:00
TeamCity	b8f44c07d4	ci: bump version to v1.0.0 [skip ci]	2025-11-03 10:38:16 +00:00
Janis	91d7f6ca00	revert: ci: bump version to v1.0.0 [skip ci]	2025-11-03 11:36:22 +01:00
TeamCity	df90abed80	ci: bump version to v1.0.0 [skip ci]	2025-11-03 10:24:00 +00:00
Janis	0d2c6f77c8	chore: added a version file	2025-11-03 09:28:43 +01:00
Janis	afde6c02da	feat!: implemented multigame support (#34 ) Reviewed-on: #34 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-11-01 20:53:22 +01:00
Janis	bef96ba7e3	fix(ui): changed backgrounds (#33 ) Reviewed-on: #33	2025-10-30 10:47:40 +01:00
lq64	c0dadf8927	feat(ui): CSS Animations #18 (#27 ) Added css animations on reload Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #27 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-10-30 08:03:00 +01:00
Janis	1f377de0f4	feat(ui): implement CSS variables for theme support (#26 ) #17 Reviewed-on: #26 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-10-29 16:52:32 +01:00
Janis	6c31fa0538	fix(ui): added dark mode (#25 ) Reviewed-on: #25 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-10-29 10:37:17 +01:00
Janis	729a4eec6b	fix(ui): add light mode styles, update font families and fixed ui (#24 ) Reviewed-on: #24 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-10-28 19:06:42 +01:00
lq64	72fcf783b8	feat(ui): LESS Integration #15-Create-a-default-theme-with-Less- (#23) Added LESS and created a light mode Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #23 Reviewed-by: Janis <janis-e@gmx.de> Co-authored-by: lq64 <lq@blackhole.local> Co-committed-by: lq64 <lq@blackhole.local>	2025-10-28 18:34:29 +01:00
Janis	1517d0c006	fix(imports): reorganized import statements for clarity and consistency (#22 ) Reviewed-on: #22 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-10-26 18:09:36 +01:00
Janis	7f765b4514	fix(base): fixed persistence logic (#21 ) Reviewed-on: #21 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-10-26 18:04:03 +01:00
Janis	03f1811ab4	refactor(ui): refactored the CSS into a separate stylesheet (#20 ) #14 [Subtask] CSS in separate stylesheet Reviewed-on: #20 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-10-24 13:55:03 +02:00
Janis	63689b7a26	refactor(ui): Fixed UI Code Smell (#19 ) Reviewed-on: #19 Reviewed-by: lq64 <lq@blackhole.local>	2025-10-23 11:08:08 +02:00
lq64	92e4851219	feat(ui): added rules (#12 ) added /rules to webui Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #12	2025-10-23 09:39:13 +02:00
Janis	c168ae7dc0	feat(ui): UI now shows player names instead of their id (#11 ) Reviewed-on: #11	2025-10-23 08:17:11 +02:00
Janis	ccf44ede41	fix(config): modified git module to use the main branch (#10 ) Reviewed-on: #10	2025-10-23 08:05:44 +02:00
Janis	d71809d6f4	feat(config): add issue templates for Epics, User Stories, and Subtasks (#4 ) Reviewed-on: #4	2025-10-22 21:16:52 +02:00
Janis	82245d6bcc	test(base): added some tests to improve the coverage (#47 ) (#2 ) Reviewed-on: KnockOutWhist/KnockOutWhist#47 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de> Reviewed-on: #2	2025-10-22 20:14:22 +02:00
Janis	d8576f669a	ci(config): added conventional commit json (#1 ) Reviewed-on: #1 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-10-22 17:47:12 +02:00
LQ63	cfe27f1e78	added picture	2025-10-22 08:42:17 +02:00
LQ63	b33ab184d2	Added rendering for Web Page	2025-10-22 08:31:25 +02:00
LQ63	b17c5160e9	Added rendering for Web Page	2025-10-22 08:24:58 +02:00
Janis	7458464dd6	Various fixes	2025-10-22 08:16:22 +02:00
Janis	f8c337fad1	Rename PlayCardEvent to RequestCardEvent for clarity in event handling	2025-10-19 20:49:26 +02:00
Janis	3357fb7310	Refactor game logic to track player input state; add CardPlayedEvent and update RoundEndEvent with trick count	2025-10-19 20:48:46 +02:00