Leahnaya/TableturfBattleApp
1
0
Fork 0
mirror of https://github.com/AndrioCelos/TableturfBattleApp.git synced 2026-09-09 20:05:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Client: Reset the pre-game form if an error occurs joining on app load

Browse Source
This commit is contained in:
Andrio Celos
2022-10-06 11:52:29 +11:00
parent a1e91f1e09
commit 91cacaf132
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
TableturfBattleClient/src/Pages/GamePage.ts
View File

@@ -398,11 +398,7 @@ document.addEventListener('keydown', e => {
document.getElementById('resultLeaveButton')!.addEventListener('click', e => {
e.preventDefault();
document.getElementById('preGameDefaultSection')!.hidden = false;
document.getElementById('preGameJoinSection')!.hidden = true;
window.location.hash = '#';
currentGame = null;
gameIDBox.value = '';
clearPreGameForm();
showSection('preGame');
newGameButton.focus();
});

44
TableturfBattleClient/src/Pages/PreGamePage.ts
View File

@@ -8,7 +8,7 @@ const gameIDBox = document.getElementById('gameIDBox') as HTMLInputElement;
if (e.submitter?.id == 'joinGameButton') {
const name = nameBox.value;
window.localStorage.setItem('name', name);
tryJoinGame(name, gameIDBox.value);
tryJoinGame(name, gameIDBox.value, false);
} else {
const name = nameBox.value;
window.localStorage.setItem('name', name);
@@ -31,10 +31,16 @@ const gameIDBox = document.getElementById('gameIDBox') as HTMLInputElement;
}
});
function tryJoinGame(name: string, idOrUrl: string) {
function tryJoinGame(name: string, idOrUrl: string, fromInitialLoad: boolean) {
const gameID = idOrUrl.substring(idOrUrl.lastIndexOf('#') + 1);
if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(gameID)) {
alert("Invalid game ID or link");
if (fromInitialLoad)
clearPreGameForm();
else {
gameIDBox.focus();
gameIDBox.setSelectionRange(0, gameIDBox.value.length);
}
return;
}
@@ -46,12 +52,19 @@ function tryJoinGame(name: string, idOrUrl: string) {
if (!clientToken)
setClientToken(response.clientToken);
getGameInfo(gameID, response.playerIndex);
} else if (request.status == 404) {
alert("The game was not found.");
window.location.hash = '#';
} else if (request.status == 410) {
alert("The game has already started.");
window.location.hash = '#';
} else {
if (request.status == 404)
alert('The game was not found.');
else if (request.status == 410)
alert('The game has already started.');
else
alert('Unable to join the room.');
if (fromInitialLoad)
clearPreGameForm();
else {
gameIDBox.focus();
gameIDBox.setSelectionRange(0, gameIDBox.value.length);
}
}
});
let data = new URLSearchParams();
@@ -192,11 +205,20 @@ function getGameInfo(gameID: string, myPlayerIndex: number | null) {
});
}
document.getElementById('preGameBackButton')!.addEventListener('click', e => {
e.preventDefault();
function backPreGameForm() {
document.getElementById('preGameDefaultSection')!.hidden = false;
document.getElementById('preGameJoinSection')!.hidden = true;
window.location.hash = '';
}
function clearPreGameForm() {
backPreGameForm();
currentGame = null;
gameIDBox.value = '';
}
document.getElementById('preGameBackButton')!.addEventListener('click', e => {
e.preventDefault();
backPreGameForm();
})
const playerName = window.localStorage.getItem('name');
@@ -206,5 +228,5 @@ if (window.location.hash != '') {
document.getElementById('preGameJoinSection')!.hidden = false;
(document.getElementById('gameIDBox') as HTMLInputElement).value = window.location.hash;
if (playerName != null)
tryJoinGame(playerName, window.location.hash)
tryJoinGame(playerName, window.location.hash, true);
}