Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4156e1c9ce | ||
| 358556612e | |||
|
|
7f82d2eeae | ||
| a55f0b4b61 | |||
|
|
f115c03ecb | ||
| fd2467a9ea |
15
CHANGELOG.md
15
CHANGELOG.md
@@ -177,3 +177,18 @@
|
|||||||
### Features
|
### 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))
|
* **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))
|
||||||
|
|||||||
@@ -73,6 +73,8 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
|
|||||||
case None =>
|
case None =>
|
||||||
println("Player ID not found or is not a valid UUID.")
|
println("Player ID not found or is not a valid UUID.")
|
||||||
}
|
}
|
||||||
|
case "ReturnToLobby" =>
|
||||||
|
gameLobby.returnToLobby(this)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
lock.unlock()
|
lock.unlock()
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<div class="row justify-content-center align-items-center flex-grow-1">
|
<div class="row justify-content-center align-items-center flex-grow-1">
|
||||||
@if((gamelobby.getUserSession(user.get.id).host)) {
|
@if((gamelobby.getUserSession(user.get.id).host)) {
|
||||||
<div class="col-12 text-center mb-5">
|
<div class="col-12 text-center mb-5">
|
||||||
<div class="btn btn-success" onclick="backToLobby('@gamelobby.id')">Return to lobby</div>
|
<div class="btn btn-success" onclick="handleReturnToLobby()">Return to lobby</div>
|
||||||
</div>
|
</div>
|
||||||
} else {
|
} else {
|
||||||
<div class="col-12 text-center mt-3">
|
<div class="col-12 text-center mt-3">
|
||||||
@@ -23,16 +23,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
<script>
|
<script>
|
||||||
function waitForFunction(name, checkInterval = 100) {
|
|
||||||
return new Promise(resolve => {
|
|
||||||
const timer = setInterval(() => {
|
|
||||||
if (typeof window[name] === "function") {
|
|
||||||
clearInterval(timer);
|
|
||||||
resolve(window[name]);
|
|
||||||
}
|
|
||||||
}, checkInterval);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
|
|
||||||
connectWebSocket()
|
connectWebSocket()
|
||||||
</script>
|
</script>
|
||||||
@@ -130,17 +130,6 @@
|
|||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
function waitForFunction(name, checkInterval = 100) {
|
|
||||||
return new Promise(resolve => {
|
|
||||||
const timer = setInterval(() => {
|
|
||||||
if (typeof window[name] === "function") {
|
|
||||||
clearInterval(timer);
|
|
||||||
resolve(window[name]);
|
|
||||||
}
|
|
||||||
}, checkInterval);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
|
|
||||||
connectWebSocket()
|
connectWebSocket()
|
||||||
canPlayCard = @gamelobby.logic.getCurrentPlayer.contains(player);
|
canPlayCard = @gamelobby.logic.getCurrentPlayer.contains(player);
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -64,16 +64,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
function waitForFunction(name, checkInterval = 100) {
|
|
||||||
return new Promise(resolve => {
|
|
||||||
const timer = setInterval(() => {
|
|
||||||
if (typeof window[name] === "function") {
|
|
||||||
clearInterval(timer);
|
|
||||||
resolve(window[name]);
|
|
||||||
}
|
|
||||||
}, checkInterval);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
|
|
||||||
connectWebSocket()
|
connectWebSocket()
|
||||||
</script>
|
</script>
|
||||||
@@ -110,16 +110,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
function waitForFunction(name, checkInterval = 100) {
|
|
||||||
return new Promise(resolve => {
|
|
||||||
const timer = setInterval(() => {
|
|
||||||
if (typeof window[name] === "function") {
|
|
||||||
clearInterval(timer);
|
|
||||||
resolve(window[name]);
|
|
||||||
}
|
|
||||||
}, checkInterval);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
|
|
||||||
connectWebSocket()
|
connectWebSocket()
|
||||||
</script>
|
</script>
|
||||||
@@ -98,18 +98,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
<script>
|
<script>
|
||||||
/*
|
|
||||||
function waitForFunction(name, checkInterval = 100) {
|
|
||||||
return new Promise(resolve => {
|
|
||||||
const timer = setInterval(() => {
|
|
||||||
if (typeof window[name] === "function") {
|
|
||||||
clearInterval(timer);
|
|
||||||
resolve(window[name]);
|
|
||||||
}
|
|
||||||
}, checkInterval);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
|
|
||||||
*/
|
|
||||||
connectWebSocket()
|
connectWebSocket()
|
||||||
</script>
|
</script>
|
||||||
@@ -77,3 +77,6 @@ function handleKickPlayer(playerId) {
|
|||||||
playerId: playerId
|
playerId: playerId
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
function handleReturnToLobby() {
|
||||||
|
sendEvent("ReturnToLobby")
|
||||||
|
}
|
||||||
@@ -87,6 +87,7 @@ function setupSocketHandlers(socket) {
|
|||||||
} else {
|
} else {
|
||||||
console.warn('Connection died unexpectedly.');
|
console.warn('Connection died unexpectedly.');
|
||||||
}
|
}
|
||||||
|
location.href = "/mainmenu";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=4
|
MAJOR=4
|
||||||
MINOR=5
|
MINOR=6
|
||||||
PATCH=0
|
PATCH=2
|
||||||
|
|||||||
Reference in New Issue
Block a user