lint codebase

This commit is contained in:
AlecM33
2022-01-11 20:36:10 -05:00
parent 553f1025a8
commit f5c0984211
38 changed files with 2422 additions and 968 deletions

View File

@@ -1,13 +1,13 @@
import { DeckStateManager } from "../modules/DeckStateManager.js";
import { GameCreationStepManager } from "../modules/GameCreationStepManager.js";
import { injectNavbar } from "../modules/Navbar.js";
import { DeckStateManager } from '../modules/DeckStateManager.js';
import { GameCreationStepManager } from '../modules/GameCreationStepManager.js';
import { injectNavbar } from '../modules/Navbar.js';
const create = () => {
injectNavbar();
let deckManager = new DeckStateManager();
let gameCreationStepManager = new GameCreationStepManager(deckManager);
gameCreationStepManager.renderStep("creation-step-container", 1);
}
const deckManager = new DeckStateManager();
const gameCreationStepManager = new GameCreationStepManager(deckManager);
gameCreationStepManager.renderStep('creation-step-container', 1);
};
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
module.exports = create;

View File

@@ -1,13 +1,13 @@
import { UserUtility } from "../modules/UserUtility.js";
import { globals } from "../config/globals.js";
import {templates} from "../modules/Templates.js";
import {GameStateRenderer} from "../modules/GameStateRenderer.js";
import {cancelCurrentToast, toast} from "../modules/Toast.js";
import {GameTimerManager} from "../modules/GameTimerManager.js";
import {ModalManager} from "../modules/ModalManager.js";
import {stateBucket} from "../modules/StateBucket.js";
import { UserUtility } from '../modules/UserUtility.js';
import { globals } from '../config/globals.js';
import { templates } from '../modules/Templates.js';
import { GameStateRenderer } from '../modules/GameStateRenderer.js';
import { toast } from '../modules/Toast.js';
import { GameTimerManager } from '../modules/GameTimerManager.js';
import { ModalManager } from '../modules/ModalManager.js';
import { stateBucket } from '../modules/StateBucket.js';
import { io } from 'socket.io-client';
import { injectNavbar } from "../modules/Navbar.js";
import { injectNavbar } from '../modules/Navbar.js';
const game = () => {
injectNavbar();
@@ -25,10 +25,10 @@ const game = () => {
timerWorker = new Worker(new URL('../modules/Timer.js', import.meta.url));
prepareGamePage(returnedEnvironment, socket, timerWorker);
});
})
});
};
function prepareGamePage(environment, socket, timerWorker) {
function prepareGamePage (environment, socket, timerWorker) {
let userId = UserUtility.validateAnonUserSignature(environment);
const splitUrl = window.location.href.split('/game/');
const accessCode = splitUrl[1];
@@ -41,11 +41,11 @@ function prepareGamePage(environment, socket, timerWorker) {
if (gameState === null) {
window.location = '/not-found?reason=' + encodeURIComponent('game-not-found');
} else {
document.getElementById("game-content").innerHTML = templates.INITIAL_GAME_DOM;
document.getElementById('game-content').innerHTML = templates.INITIAL_GAME_DOM;
toast('You are connected.', 'success', true, true, 2);
userId = gameState.client.cookie;
UserUtility.setAnonymousUserId(userId, environment);
let gameStateRenderer = new GameStateRenderer(stateBucket, socket);
const gameStateRenderer = new GameStateRenderer(stateBucket, socket);
let gameTimerManager;
if (stateBucket.currentGameState.timerParams) {
gameTimerManager = new GameTimerManager(stateBucket, socket);
@@ -53,30 +53,30 @@ function prepareGamePage(environment, socket, timerWorker) {
initializeGame(stateBucket, socket, timerWorker, userId, gameStateRenderer, gameTimerManager);
if (!gameState.client.hasEnteredName) {
document.getElementById("prompt").innerHTML = templates.NAME_CHANGE_MODAL;
document.getElementById("change-name-form").onsubmit = (e) => {
document.getElementById('prompt').innerHTML = templates.NAME_CHANGE_MODAL;
document.getElementById('change-name-form').onsubmit = (e) => {
e.preventDefault();
let name = document.getElementById("player-new-name").value;
const name = document.getElementById('player-new-name').value;
if (validateName(name)) {
socket.emit(globals.COMMANDS.CHANGE_NAME, gameState.accessCode, {
name: name,
personId: gameState.client.id
}, (result) => {
switch (result) {
case "taken":
case 'taken':
toast('This name is already taken.', 'error', true, true, 8);
break;
case "changed":
ModalManager.dispelModal("change-name-modal", "change-name-modal-background")
case 'changed':
ModalManager.dispelModal('change-name-modal', 'change-name-modal-background');
toast('Name set.', 'success', true, true, 5);
propagateNameChange(stateBucket.currentGameState, name, stateBucket.currentGameState.client.id);
processGameState(stateBucket.currentGameState, userId, socket, gameStateRenderer, gameTimerManager, timerWorker);
}
})
});
} else {
toast("Name must be between 1 and 30 characters.", 'error', true, true, 8);
toast('Name must be between 1 and 30 characters.', 'error', true, true, 8);
}
}
};
}
}
});
@@ -85,20 +85,20 @@ function prepareGamePage(environment, socket, timerWorker) {
}
}
function initializeGame(stateBucket, socket, timerWorker, userId, gameStateRenderer, gameTimerManager) {
function initializeGame (stateBucket, socket, timerWorker, userId, gameStateRenderer, gameTimerManager) {
setClientSocketHandlers(stateBucket, gameStateRenderer, socket, timerWorker, gameTimerManager);
processGameState(stateBucket.currentGameState, userId, socket, gameStateRenderer, gameTimerManager, timerWorker);
}
function processGameState (currentGameState, userId, socket, gameStateRenderer, gameTimerManager, timerWorker, refreshPrompt=true) {
function processGameState (currentGameState, userId, socket, gameStateRenderer, gameTimerManager, timerWorker, refreshPrompt = true) {
displayClientInfo(currentGameState.client.name, currentGameState.client.userType);
if (refreshPrompt) {
removeStartGameFunctionalityIfPresent(gameStateRenderer);
document.querySelector("#end-game-prompt")?.remove();
document.querySelector('#end-game-prompt')?.remove();
}
switch (currentGameState.status) {
case globals.STATUS.LOBBY:
document.getElementById("game-state-container").innerHTML = templates.LOBBY;
document.getElementById('game-state-container').innerHTML = templates.LOBBY;
gameStateRenderer.renderLobbyHeader();
gameStateRenderer.renderLobbyPlayers();
if (
@@ -109,31 +109,31 @@ function processGameState (currentGameState, userId, socket, gameStateRenderer,
)
&& refreshPrompt
) {
displayStartGamePromptForModerators(currentGameState, gameStateRenderer);
displayStartGamePromptForModerators(currentGameState, gameStateRenderer);
}
break;
case globals.STATUS.IN_PROGRESS:
gameStateRenderer.renderGameHeader();
switch (currentGameState.client.userType) {
case globals.USER_TYPES.PLAYER:
document.getElementById("game-state-container").innerHTML = templates.PLAYER_GAME_VIEW;
document.getElementById('game-state-container').innerHTML = templates.PLAYER_GAME_VIEW;
gameStateRenderer.renderPlayerView();
break;
case globals.USER_TYPES.KILLED_PLAYER:
document.getElementById("game-state-container").innerHTML = templates.PLAYER_GAME_VIEW;
document.getElementById('game-state-container').innerHTML = templates.PLAYER_GAME_VIEW;
gameStateRenderer.renderPlayerView(true);
break;
case globals.USER_TYPES.MODERATOR:
document.getElementById("game-state-container").innerHTML = templates.MODERATOR_GAME_VIEW;
document.getElementById('game-state-container').innerHTML = templates.MODERATOR_GAME_VIEW;
gameStateRenderer.renderModeratorView();
break;
case globals.USER_TYPES.TEMPORARY_MODERATOR:
document.getElementById("game-state-container").innerHTML = templates.TEMP_MOD_GAME_VIEW;
document.getElementById('game-state-container').innerHTML = templates.TEMP_MOD_GAME_VIEW;
gameStateRenderer.renderTempModView();
break;
case globals.USER_TYPES.SPECTATOR:
document.getElementById("game-state-container").innerHTML = templates.SPECTATOR_GAME_VIEW;
document.getElementById('game-state-container').innerHTML = templates.SPECTATOR_GAME_VIEW;
gameStateRenderer.renderSpectatorView();
break;
default:
@@ -148,12 +148,13 @@ function processGameState (currentGameState, userId, socket, gameStateRenderer,
document.querySelector('label[for="game-timer"]')?.remove();
}
break;
case globals.STATUS.ENDED:
let container = document.getElementById("game-state-container")
case globals.STATUS.ENDED: {
const container = document.getElementById('game-state-container');
container.innerHTML = templates.END_OF_GAME_VIEW;
container.classList.add('vertical-flex');
gameStateRenderer.renderEndOfGame();
break;
}
default:
break;
}
@@ -161,16 +162,16 @@ function processGameState (currentGameState, userId, socket, gameStateRenderer,
activateRoleInfoButton(stateBucket.currentGameState.deck);
}
function displayClientInfo(name, userType) {
document.getElementById("client-name").innerText = name;
document.getElementById("client-user-type").innerText = userType;
document.getElementById("client-user-type").innerText += globals.USER_TYPE_ICONS[userType];
function displayClientInfo (name, userType) {
document.getElementById('client-name').innerText = name;
document.getElementById('client-user-type').innerText = userType;
document.getElementById('client-user-type').innerText += globals.USER_TYPE_ICONS[userType];
}
function setClientSocketHandlers(stateBucket, gameStateRenderer, socket, timerWorker, gameTimerManager) {
function setClientSocketHandlers (stateBucket, gameStateRenderer, socket, timerWorker, gameTimerManager) {
if (!socket.hasListeners(globals.EVENTS.PLAYER_JOINED)) {
socket.on(globals.EVENTS.PLAYER_JOINED, (player, gameIsFull) => {
toast(player.name + " joined!", "success", false, true, 3);
toast(player.name + ' joined!', 'success', false, true, 3);
stateBucket.currentGameState.people.push(player);
stateBucket.currentGameState.isFull = gameIsFull;
gameStateRenderer.renderLobbyPlayers();
@@ -189,8 +190,8 @@ function setClientSocketHandlers(stateBucket, gameStateRenderer, socket, timerWo
if (!socket.hasListeners(globals.EVENTS.PLAYER_LEFT)) {
socket.on(globals.EVENTS.PLAYER_LEFT, (player) => {
removeStartGameFunctionalityIfPresent(gameStateRenderer);
toast(player.name + " has left!", "error", false, true, 3);
let index = stateBucket.currentGameState.people.findIndex(person => person.id === player.id);
toast(player.name + ' has left!', 'error', false, true, 3);
const index = stateBucket.currentGameState.people.findIndex(person => person.id === player.id);
if (index >= 0) {
stateBucket.currentGameState.people.splice(
index,
@@ -248,17 +249,17 @@ function setClientSocketHandlers(stateBucket, gameStateRenderer, socket, timerWo
if (!socket.hasListeners(globals.EVENTS.KILL_PLAYER)) {
socket.on(globals.EVENTS.KILL_PLAYER, (id) => {
let killedPerson = stateBucket.currentGameState.people.find((person) => person.id === id);
const killedPerson = stateBucket.currentGameState.people.find((person) => person.id === id);
if (killedPerson) {
killedPerson.out = true;
if (stateBucket.currentGameState.client.userType === globals.USER_TYPES.MODERATOR) {
toast(killedPerson.name + ' killed.', 'success', true, true, 6);
gameStateRenderer.renderPlayersWithRoleAndAlignmentInfo(stateBucket.currentGameState.status === globals.STATUS.ENDED)
gameStateRenderer.renderPlayersWithRoleAndAlignmentInfo(stateBucket.currentGameState.status === globals.STATUS.ENDED);
} else {
if (killedPerson.id === stateBucket.currentGameState.client.id) {
let clientUserType = document.getElementById("client-user-type");
const clientUserType = document.getElementById('client-user-type');
if (clientUserType) {
clientUserType.innerText = globals.USER_TYPES.KILLED_PLAYER + ' \uD83D\uDC80'
clientUserType.innerText = globals.USER_TYPES.KILLED_PLAYER + ' \uD83D\uDC80';
}
gameStateRenderer.updatePlayerCardToKilledState();
toast('You have been killed!', 'warning', true, true, 6);
@@ -277,14 +278,14 @@ function setClientSocketHandlers(stateBucket, gameStateRenderer, socket, timerWo
if (!socket.hasListeners(globals.EVENTS.REVEAL_PLAYER)) {
socket.on(globals.EVENTS.REVEAL_PLAYER, (revealData) => {
let revealedPerson = stateBucket.currentGameState.people.find((person) => person.id === revealData.id);
const revealedPerson = stateBucket.currentGameState.people.find((person) => person.id === revealData.id);
if (revealedPerson) {
revealedPerson.revealed = true;
revealedPerson.gameRole = revealData.gameRole;
revealedPerson.alignment = revealData.alignment;
if (stateBucket.currentGameState.client.userType === globals.USER_TYPES.MODERATOR) {
toast(revealedPerson.name + ' revealed.', 'success', true, true, 6);
gameStateRenderer.renderPlayersWithRoleAndAlignmentInfo(stateBucket.currentGameState.status === globals.STATUS.ENDED)
gameStateRenderer.renderPlayersWithRoleAndAlignmentInfo(stateBucket.currentGameState.status === globals.STATUS.ENDED);
} else {
if (revealedPerson.id === stateBucket.currentGameState.client.id) {
toast('Your role has been revealed!', 'warning', true, true, 6);
@@ -333,38 +334,27 @@ function setClientSocketHandlers(stateBucket, gameStateRenderer, socket, timerWo
}
}
function displayStartGamePromptForModerators(gameState, gameStateRenderer) {
let div = document.createElement("div");
function displayStartGamePromptForModerators (gameState, gameStateRenderer) {
const div = document.createElement('div');
div.innerHTML = templates.START_GAME_PROMPT;
div.querySelector('#start-game-button').addEventListener('click', gameStateRenderer.startGameHandler);
document.body.appendChild(div);
}
function runGameTimer (hours, minutes, tickRate, soundManager, timerWorker) {
if (window.Worker) {
timerWorker.onmessage = function (e) {
if (e.data.hasOwnProperty('timeRemainingInMilliseconds') && e.data.timeRemainingInMilliseconds > 0) {
document.getElementById('game-timer').innerText = e.data.displayTime;
}
};
timerWorker.postMessage({ hours: hours, minutes: minutes, tickInterval: tickRate });
}
}
function validateName(name) {
function validateName (name) {
return typeof name === 'string' && name.length > 0 && name.length <= 30;
}
function removeStartGameFunctionalityIfPresent(gameStateRenderer) {
document.querySelector("#start-game-prompt")?.removeEventListener('click', gameStateRenderer.startGameHandler);
document.querySelector("#start-game-prompt")?.remove();
function removeStartGameFunctionalityIfPresent (gameStateRenderer) {
document.querySelector('#start-game-prompt')?.removeEventListener('click', gameStateRenderer.startGameHandler);
document.querySelector('#start-game-prompt')?.remove();
}
function propagateNameChange(gameState, name, personId) {
function propagateNameChange (gameState, name, personId) {
if (gameState.client.id === personId) {
gameState.client.name = name;
}
let matchingPerson = gameState.people.find((person) => person.id === personId);
const matchingPerson = gameState.people.find((person) => person.id === personId);
if (matchingPerson) {
matchingPerson.name = name;
}
@@ -373,13 +363,13 @@ function propagateNameChange(gameState, name, personId) {
gameState.moderator.name = name;
}
let matchingSpectator = gameState.spectators?.find((spectator) => spectator.id === personId);
const matchingSpectator = gameState.spectators?.find((spectator) => spectator.id === personId);
if (matchingSpectator) {
matchingSpectator.name = name;
}
}
function updateDOMWithNameChange(gameState, gameStateRenderer) {
function updateDOMWithNameChange (gameState, gameStateRenderer) {
if (gameState.status === globals.STATUS.IN_PROGRESS) {
switch (gameState.client.userType) {
case globals.USER_TYPES.PLAYER:
@@ -401,23 +391,23 @@ function updateDOMWithNameChange(gameState, gameStateRenderer) {
}
}
function activateRoleInfoButton(deck) {
function activateRoleInfoButton (deck) {
deck.sort((a, b) => {
return a.team === globals.ALIGNMENT.GOOD ? 1 : -1;
})
document.getElementById("role-info-button").addEventListener("click", (e) => {
});
document.getElementById('role-info-button').addEventListener('click', (e) => {
e.preventDefault();
document.getElementById("prompt").innerHTML = templates.ROLE_INFO_MODAL;
let modalContent = document.getElementById('game-role-info-container');
for (let card of deck) {
let roleDiv = document.createElement("div");
let roleNameDiv = document.createElement("div");
document.getElementById('prompt').innerHTML = templates.ROLE_INFO_MODAL;
const modalContent = document.getElementById('game-role-info-container');
for (const card of deck) {
const roleDiv = document.createElement('div');
const roleNameDiv = document.createElement('div');
roleNameDiv.classList.add('role-info-name');
let roleName = document.createElement("h5");
let roleQuantity = document.createElement("h5");
let roleDescription = document.createElement("p");
const roleName = document.createElement('h5');
const roleQuantity = document.createElement('h5');
const roleDescription = document.createElement('p');
roleDescription.innerText = card.description;
roleName.innerText = card.role;
@@ -429,8 +419,8 @@ function activateRoleInfoButton(deck) {
roleName.classList.add(globals.ALIGNMENT.EVIL);
}
roleNameDiv .appendChild(roleQuantity);
roleNameDiv .appendChild(roleName);
roleNameDiv.appendChild(roleQuantity);
roleNameDiv.appendChild(roleName);
roleDiv.appendChild(roleNameDiv);
roleDiv.appendChild(roleDescription);

View File

@@ -1,44 +1,44 @@
import { XHRUtility } from "../modules/XHRUtility.js";
import { toast } from "../modules/Toast.js";
import { injectNavbar } from "../modules/Navbar.js";
import { XHRUtility } from '../modules/XHRUtility.js';
import { toast } from '../modules/Toast.js';
import { injectNavbar } from '../modules/Navbar.js';
const home = () => {
injectNavbar();
document.getElementById("join-form").onsubmit = (e) => {
document.getElementById('join-form').onsubmit = (e) => {
e.preventDefault();
let userCode = document.getElementById("room-code").value;
const userCode = document.getElementById('room-code').value;
if (roomCodeIsValid(userCode)) {
attemptToJoinGame(userCode);
} else {
toast('Invalid code. Codes are 6 numbers or letters.', 'error', true, true);
}
}
};
};
function roomCodeIsValid(code) {
return typeof code === "string" && /^[a-z0-9]{6}$/.test(code.toLowerCase());
function roomCodeIsValid (code) {
return typeof code === 'string' && /^[a-z0-9]{6}$/.test(code.toLowerCase());
}
function attemptToJoinGame(code) {
function attemptToJoinGame (code) {
XHRUtility.xhr(
'/api/games/availability/' + code.toLowerCase().trim(),
'GET',
null,
null
)
.then((res) => {
if (res.status === 200) {
window.location = '/game/' + res.content;
}
}).catch((res) => {
if (res.status === 404) {
toast("Game not found", "error", true);
} else if (res.status === 400) {
toast(res.content, "error", true);
} else {
toast("An unknown error occurred. Please try again later.", "error", true);
}
});
.then((res) => {
if (res.status === 200) {
window.location = '/game/' + res.content;
}
}).catch((res) => {
if (res.status === 404) {
toast('Game not found', 'error', true);
} else if (res.status === 400) {
toast(res.content, 'error', true);
} else {
toast('An unknown error occurred. Please try again later.', 'error', true);
}
});
}
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
@@ -46,4 +46,3 @@ if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
} else {
home();
}

View File

@@ -1,4 +1,4 @@
import { injectNavbar } from "../modules/Navbar.js";
import { injectNavbar } from '../modules/Navbar.js';
const howToUse = () => { injectNavbar(); };

View File

@@ -1,4 +1,4 @@
import { injectNavbar } from "../modules/Navbar.js";
import { injectNavbar } from '../modules/Navbar.js';
const notFound = () => { injectNavbar(); };