aboutsummaryrefslogtreecommitdiffstats
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/ts/api/getCurrentGameState.ts2
-rw-r--r--backend/ts/api/login.ts1
-rw-r--r--backend/ts/startGame.ts22
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]);
+}