From 040d5372c1033bb7c0580ad2c9b6b32f974a20c8 Mon Sep 17 00:00:00 2001
From: Maks Jopek <maksymilian.jopek@prym-soft.pl>
Date: Thu, 29 Apr 2021 20:05:06 +0200
Subject: Version 1.0

---
 backend/ts/api/getCurrentGameState.ts |  8 ++------
 backend/ts/api/login.ts               | 13 ++++---------
 backend/ts/api/readyStateToggle.ts    |  4 +---
 backend/ts/api/saveGameBoard.ts       |  5 ++---
 4 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'backend/ts/api')

diff --git a/backend/ts/api/getCurrentGameState.ts b/backend/ts/api/getCurrentGameState.ts
index 028cf04..28522e1 100644
--- a/backend/ts/api/getCurrentGameState.ts
+++ b/backend/ts/api/getCurrentGameState.ts
@@ -1,8 +1,7 @@
 import { Request, Response } from "express";
-import { Data, makeQuery, getData, API_RES, GameBoard } from "../../../helpers/helpersBack";
+import { Data, makeQuery, API_RES, GameBoard } from "../../../helpers/helpersBack";
 
 export default async function getCurrentGameState(req: Request, res: Response) {
-    // console.log("request.session", req.session)
     if (req.session === undefined || req.session.gid === undefined) {
         res.status(400);
         res.send(API_RES.failure);
@@ -13,13 +12,10 @@ export default async function getCurrentGameState(req: Request, res: Response) {
         = (await makeQuery("SELECT `gameBoard`, `currentPlayer`, `started`, `data`, `timeTillTurnEnd`"
             + " FROM `fia` WHERE `id` = ?",
             [req.session.gid]))[0];
-
     
     if (dbRes.started === 0) {
         res.send(JSON.stringify({ data: dbRes.data }));
     } else {
         res.send(JSON.stringify(dbRes));
     }
-
-    
-}
\ No newline at end of file
+}
diff --git a/backend/ts/api/login.ts b/backend/ts/api/login.ts
index 4b5ff87..a957760 100644
--- a/backend/ts/api/login.ts
+++ b/backend/ts/api/login.ts
@@ -1,5 +1,5 @@
 import { Request, Response } from "express";
-import { fiaTable, dbRes, Color, Colors, Helpers, makeQuery, Chequer, tColors, waitForQueue } from "../../../helpers/helpersBack";
+import { fiaTable, Helpers, makeQuery, tColors, waitForQueue } from "../../../helpers/helpersBack";
 import startGame from "../startGame";
 import { global } from "../index";
 
@@ -27,24 +27,19 @@ export default async function apiLogin(req: Request, res: Response) {
       id: req.session.uid,
       index: 0,
       ready: false,
-      color: Color.red,
+      color: color,
       name: req.body.name,
     }];
+
     req.session.color = color;
 
     await makeQuery('INSERT INTO `fia`(`data`) VALUES (?)', [row.data]);
-    req.session.gid = (await makeQuery('SELECT `id` FROM `fia` WHERE `data`= ?', [row.data]) as any)[0].id;
+    req.session.gid = (await makeQuery('SELECT `id` FROM `fia` WHERE `data`= ?', [row.data]))[0].id;
   } else {
-    // row = Helpers.dbResToFiaTable(dbRes[0]);
     row = dbRes[0];
     let playersColors: Array<tColors> = [],
       colors = [...Array(4).keys()];
 
-    if (row.data.filter(el => el.id !== req.session?.uid).length === 0) {
-      res.send(JSON.stringify({ data: row.data, uid: req.session.uid }));
-      return;
-    }
-
     for (let playerData of row.data)
       playersColors.push(playerData.color);
 
diff --git a/backend/ts/api/readyStateToggle.ts b/backend/ts/api/readyStateToggle.ts
index e1b08b2..fc14f72 100644
--- a/backend/ts/api/readyStateToggle.ts
+++ b/backend/ts/api/readyStateToggle.ts
@@ -1,5 +1,5 @@
 import { Request, Response } from "express";
-import { makeQuery, Data, getData, API_RES, waitForQueue } from "../../../helpers/helpersBack";
+import { makeQuery, Data, API_RES, waitForQueue } from "../../../helpers/helpersBack";
 import startGame from "../startGame";
 import {global} from "../index";
 
@@ -21,7 +21,6 @@ export default async function (req: Request, res: Response) {
         started = false;
 
     if (data.started === 0) {
-
         for (let player of data.data) {
             if (player.id === req.session.uid)
                 player.ready = req.body.state ? true : false;
@@ -36,7 +35,6 @@ export default async function (req: Request, res: Response) {
             startGame(req.session.gid);
             started = true;
         }
-
     }
     global.stop = false;
     res.send(`{"success": true, "started": ${started}}`);
diff --git a/backend/ts/api/saveGameBoard.ts b/backend/ts/api/saveGameBoard.ts
index df2b7a0..7871ff5 100644
--- a/backend/ts/api/saveGameBoard.ts
+++ b/backend/ts/api/saveGameBoard.ts
@@ -7,11 +7,10 @@ export default async function saveGameBoard(req: Request, res: Response) {
         res.send(API_RES.failure);
         return;
     }
-    console.log("saving gameBoard");
+
     let query = "UPDATE `fia` SET `currentPlayer` = IF(`currentPlayer` + 1 = `playersCount`, 0, `currentPlayer` + 1), "
-        + "`gameBoard` = ?, `timeTillTurnEnd` = ? WHERE `id` = ?"
+        + "`gameBoard` = ?, `timeTillTurnEnd` = ? WHERE `id` = ?";
     await makeQuery(query, [req.body.gameBoard, nextTurnEndsAt(), req.session.gid]);
 
     res.send(API_RES.success);
 }
-//UPDATE `fia` SET `currentPlayer` = IF( `currentPlayer` + 1 = `playersCount`, 0, `currentPlayer` + 1 ) WHERE `id` = 169
\ No newline at end of file
-- 
cgit v1.3.1