diff options
| author | Maksymilian Jopek <maks@jopek.eu> | 2023-04-03 22:12:41 +0200 |
|---|---|---|
| committer | Maksymilian Jopek <maks@jopek.eu> | 2023-04-03 22:12:41 +0200 |
| commit | 1df1ff6f074528a4ad6d4015c794a1555c1c942f (patch) | |
| tree | ad3b16291748c60441967996706006555919ef73 /backend | |
| parent | c813dfadd4b673080695ef3ade37a44e37036c07 (diff) | |
| download | fia-1df1ff6f074528a4ad6d4015c794a1555c1c942f.tar.gz fia-1df1ff6f074528a4ad6d4015c794a1555c1c942f.tar.zst fia-1df1ff6f074528a4ad6d4015c794a1555c1c942f.zip | |
Polishing up
Add all files to repo
Add sql database
Correct urls
Add PHP code to repo
Update README.md with instructions how to start
Move from yarn to pnpm
Fix all issues with starting
Fix possibility of player changing their dice roll with refreshing the game
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/ts/api/getCurrentGameState.ts | 2 | ||||
| -rw-r--r-- | backend/ts/api/login.ts | 1 | ||||
| -rw-r--r-- | backend/ts/startGame.ts | 22 |
3 files changed, 14 insertions, 11 deletions
diff --git a/backend/ts/api/getCurrentGameState.ts b/backend/ts/api/getCurrentGameState.ts index 896ccb4..4c87d18 100644 --- a/backend/ts/api/getCurrentGameState.ts +++ b/backend/ts/api/getCurrentGameState.ts @@ -12,7 +12,7 @@ export default async function getCurrentGameState(req: Request, res: Response) { = (await makeQuery("SELECT `gameBoard`, `currentPlayer`, `started`, `data`, `timeTillTurnEnd`, `winner`" + " FROM `fia` WHERE `id` = ?", [req.session.gid]))[0]; - + if (dbRes.started === 0) { res.send(JSON.stringify({ data: dbRes.data })); } else { diff --git a/backend/ts/api/login.ts b/backend/ts/api/login.ts index c01ef75..3b001ce 100644 --- a/backend/ts/api/login.ts +++ b/backend/ts/api/login.ts @@ -19,6 +19,7 @@ export default async function apiLogin(req: Request, res: Response) { let dbRes = (await makeQuery("SELECT * FROM `fia` WHERE `started`= 0 LIMIT 1", [])) as Array<fiaTable>, row: fiaTable; + if (dbRes[0] === undefined) { let color = Helpers.getRandomInt(0, 4); row = {} as fiaTable; diff --git a/backend/ts/startGame.ts b/backend/ts/startGame.ts index a247982..f8c6cb4 100644 --- a/backend/ts/startGame.ts +++ b/backend/ts/startGame.ts @@ -1,16 +1,18 @@ import { makeQuery, nextTurnEndsAt, GameBoard, Data, HomesOrBases } from "../../helpers/helpersBack"; export default async function startGame(gid: number) { - let dbRes: {gameBoard: GameBoard, data: Data} = - (await makeQuery("SELECT `gameBoard`, `data` FROM `fia` WHERE `id` = ?", [gid]))[0]; + let dbRes: { gameBoard: GameBoard, data: Data } = + (await makeQuery("SELECT `gameBoard`, `data` FROM `fia` WHERE `id` = ?", [gid]))[0]; - for (let player of dbRes.data) { - player.ready = true; - for(let square of dbRes.gameBoard.bases[player.color as keyof HomesOrBases]) { - square.chequer = player.color; - } + console.log(dbRes.gameBoard) + for (let player of dbRes.data) { + player.ready = true; + for (let square of dbRes.gameBoard.bases[player.color as keyof HomesOrBases]) { + square.chequer = player.color; } + } + console.log(dbRes.gameBoard) - await makeQuery("UPDATE `fia` SET `gameBoard` = ?, `started` = 1, `timeTillTurnEnd` = ?, `data` = ? WHERE `id`= ?", - [dbRes.gameBoard, nextTurnEndsAt(), dbRes.data, gid]); -}
\ No newline at end of file + await makeQuery("UPDATE `fia` SET `gameBoard` = ?, `started` = 1, `timeTillTurnEnd` = ?, `data` = ? WHERE `id`= ?", + [dbRes.gameBoard, nextTurnEndsAt(), dbRes.data, gid]); +} |
