From ef523056ece6becd9423196b2a7d6bf45aca937e Mon Sep 17 00:00:00 2001
From: Halit Aksoy <jhalitaksoy@gmail.com>
Date: Thu, 14 Jul 2022 13:23:15 +0300
Subject: [PATCH] fix warnings

---
 src/Home.tsx                       | 26 +++++------
 src/components/HeaderBar.tsx       | 15 ++++--
 src/components/InfoPanel.tsx       | 22 ++++-----
 src/components/board/BoardView.tsx | 74 ++++++++----------------------
 src/components/board/StoneView.tsx |  2 +-
 src/util/Util.ts                   |  2 +-
 6 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/src/Home.tsx b/src/Home.tsx
index 2148a47..d05ecb4 100644
--- a/src/Home.tsx
+++ b/src/Home.tsx
@@ -26,24 +26,24 @@ import PageContainer from "./components/PageContainer";
 type ConnectionState = "connecting" | "error" | "connected" | "reconnecting";
 
 const Home: FunctionComponent<{ initial?: number }> = ({ initial = 0 }) => {
-  const [userKey, setUserKey] = useState(undefined);
+  const [userKey, setUserKey] = useState<string | undefined>(undefined);
 
   const [connectionState, setConnetionState] =
     useState<ConnectionState>("connecting");
 
   const [searchingOpponent, setSearchingOpponent] = useState<boolean>(false);
 
-  const [game, setGame] = useState<CommonMancalaGame>(undefined);
+  const [game, setGame] = useState<CommonMancalaGame | undefined>(undefined);
 
-  const [crashMessage, setCrashMessage] = useState<string>(undefined);
+  const [crashMessage, setCrashMessage] = useState<string | undefined>(undefined);
 
-  const [userKeyWhoLeave, setUserKeyWhoLeave] = useState<string>(undefined);
+  const [userKeyWhoLeave, setUserKeyWhoLeave] = useState<string | undefined>(undefined);
 
-  const [boardViewModel, setBoardViewModel] = useState<BoardViewModel>(null);
+  const [boardViewModel, setBoardViewModel] = useState<BoardViewModel | undefined>(undefined);
 
-  const [boardId, setBoardId] = useState<string>();
+  const [boardId, setBoardId] = useState<string>("-1");
 
-  const [pitAnimator, setPitAnimator] = useState<PitAnimator>();
+  const [pitAnimator, setPitAnimator] = useState<PitAnimator | undefined>(undefined);
 
   const [theme, setTheme] = useState<Theme | undefined>(undefined);
 
@@ -119,6 +119,7 @@ const Home: FunctionComponent<{ initial?: number }> = ({ initial = 0 }) => {
   };
 
   const getBoardIndex = (index: number) => {
+    if(!game) return -1;
     if (userKey === game.player2Id) return index + game.board.pits.length / 2;
     return index;
   };
@@ -137,7 +138,7 @@ const Home: FunctionComponent<{ initial?: number }> = ({ initial = 0 }) => {
   React.useEffect(() => {
     context.themeManager.onThemeChange = (theme) => {
       setTheme(theme);
-      pitAnimator && updateBoardViewModel(pitAnimator.getBoardViewModelFromGame(game));
+      pitAnimator && game && updateBoardViewModel(pitAnimator.getBoardViewModelFromGame(game));
     };
   }, [boardViewModel]);
 
@@ -152,6 +153,7 @@ const Home: FunctionComponent<{ initial?: number }> = ({ initial = 0 }) => {
   };
 
   const onPitSelect = (index: number, pit: Pit) => {
+    if(!boardViewModel) return;
     //TODO : stoneCount comes from view model!
     if (pit.stoneCount === 0) {
       //TODO : warn user
@@ -201,17 +203,15 @@ const Home: FunctionComponent<{ initial?: number }> = ({ initial = 0 }) => {
         crashMessage={crashMessage}
         userKey={userKey}
         userKeyWhoLeave={userKeyWhoLeave}
-        searchingOpponent={searchingOpponent}
-      />
-      {game && boardViewModel && (
+        searchingOpponent={searchingOpponent} />
+      {game && boardViewModel && userKey && (
         <BoardView
           userKey={userKey}
           game={game}
           boardId={boardId}
           boardViewModel={boardViewModel}
           context={context}
-          onPitSelect={onPitSelect}
-        />
+          onPitSelect={onPitSelect} />
       )}
     </PageContainer>
   );
diff --git a/src/components/HeaderBar.tsx b/src/components/HeaderBar.tsx
index 253c51e..78d8c98 100644
--- a/src/components/HeaderBar.tsx
+++ b/src/components/HeaderBar.tsx
@@ -8,7 +8,12 @@ import Button from "./Button";
 import "@szhsin/react-menu/dist/index.css";
 import "@szhsin/react-menu/dist/transitions/slide.css";
 
-function renderNewGameButton(context: Context, game: MancalaGame, onNewGameClick: () => void, userKeyWhoLeave: string, crashMessage: string): JSX.Element {
+function renderNewGameButton(
+    context: Context, game:
+        MancalaGame | undefined,
+    onNewGameClick: () => void,
+    userKeyWhoLeave: string | undefined,
+    crashMessage: string | undefined): JSX.Element {
     const newGame = (
         <Button
             context={context}
@@ -33,9 +38,9 @@ function renderNewGameButton(context: Context, game: MancalaGame, onNewGameClick
 
 const HeaderBar: FunctionComponent<{
     context: Context,
-    game: MancalaGame,
-    userKeyWhoLeave: string,
-    crashMessage: string,
+    game?: MancalaGame,
+    userKeyWhoLeave?: string,
+    crashMessage?: string,
     onNewGameClick: () => void,
     onLeaveGameClick: () => void
 }> = (props) => {
@@ -98,8 +103,10 @@ const ThemeSwitchMenu: FunctionComponent<{ context: Context, textColor: string }
         return (<MenuItem
             key={index}
             style={{ color: textColor }}
+            //@ts-ignore
             onMouseOver={(event) => (event.target.style.background =
                 context.themeManager.theme.background)}
+            //@ts-ignore
             onMouseOut={(event) => (event.target.style.background = "transparent")}
             onClick={() => (context.themeManager.theme = theme)}>
             <div style={{
diff --git a/src/components/InfoPanel.tsx b/src/components/InfoPanel.tsx
index ca6951b..1462ca9 100644
--- a/src/components/InfoPanel.tsx
+++ b/src/components/InfoPanel.tsx
@@ -6,10 +6,10 @@ import { getColorByBrightness } from "../util/ColorUtil";
 
 function getInfoPanelTextByGameState(params: {
   context: Context;
-  game: MancalaGame;
-  crashMessage: string;
-  userKey: string;
-  userKeyWhoLeave: string;
+  game?: MancalaGame;
+  crashMessage?: string;
+  userKey?: string;
+  userKeyWhoLeave?: string;
   searchingOpponent: boolean;
 }): string | undefined {
   const {
@@ -42,9 +42,9 @@ function getInfoPanelTextByGameState(params: {
     return context.texts.GameEnded + " " + whoWon;
   } else {
     if (game) {
-      return game.checkIsPlayerTurn(userKey)
+      return userKey ? game.checkIsPlayerTurn(userKey)
         ? context.texts.YourTurn
-        : context.texts.OpponentTurn;
+        : context.texts.OpponentTurn : undefined;
     }
   }
   return undefined;
@@ -70,10 +70,10 @@ const InfoPanelContainer: FunctionComponent<{
 
 const InfoPanel: FunctionComponent<{
   context: Context;
-  game: MancalaGame;
-  crashMessage: string;
-  userKey: string;
-  userKeyWhoLeave: string;
+  game?: MancalaGame;
+  crashMessage?: string;
+  userKey?: string;
+  userKeyWhoLeave?: string;
   searchingOpponent: boolean;
 }> = ({
   context,
@@ -83,7 +83,7 @@ const InfoPanel: FunctionComponent<{
   userKeyWhoLeave,
   searchingOpponent,
 }) => {
-    const isUserTurn = game?.checkIsPlayerTurn(userKey);
+    const isUserTurn = userKey ? game?.checkIsPlayerTurn(userKey) : false;
     const containerColor = isUserTurn
       ? context.themeManager.theme.playerTurnColor
       : context.themeManager.theme.boardColor;
diff --git a/src/components/board/BoardView.tsx b/src/components/board/BoardView.tsx
index 1d482f2..673e28e 100644
--- a/src/components/board/BoardView.tsx
+++ b/src/components/board/BoardView.tsx
@@ -1,6 +1,6 @@
-import { Bank, MancalaGame, Pit } from "mancala.js";
 import * as React from "react";
-import { FunctionComponent, useState } from "react";
+import { MancalaGame, Pit } from "mancala.js";
+import { FunctionComponent } from "react";
 import { Context } from "../../context";
 import BoardViewModel from "../../viewmodel/BoardViewModel";
 import PitViewModel from "../../viewmodel/PitViewModel";
@@ -8,7 +8,7 @@ import PitView from "./PitView";
 import StoreView from "./StoreView";
 
 const BoardView: FunctionComponent<{
-  game?: MancalaGame;
+  game: MancalaGame;
   context: Context;
   boardId: string;
   boardViewModel: BoardViewModel;
@@ -21,7 +21,7 @@ const BoardView: FunctionComponent<{
   const player1Pits = game?.board.player1Pits.map((pit, index) => {
     const pitViewModel = boardViewModel.pits[pit.index];
     return createPitView(index, pitViewModel, () => {
-      if (game.turnPlayerId === game.player1Id && userKey === game.player1Id) 
+      if (game.turnPlayerId === game.player1Id && userKey === game.player1Id)
         onPitSelect(game.board.player1Pits.indexOf(pit), pit);
     });
   });
@@ -37,22 +37,7 @@ const BoardView: FunctionComponent<{
     boardViewModel.pits[game.board.player1BankIndex()];
   const player2BankViewModel =
     boardViewModel.pits[game.board.player2BankIndex()];
-  const player1Bank = (
-    <StoreView
-      context={context}
-      pitViewModel={player1BankViewModel}
-      gridColumn="1 / 2"
-      gridRow="1 / 3"
-    />
-  );
-  const player2Bank = (
-    <StoreView
-      context={context}
-      pitViewModel={player2BankViewModel}
-      gridColumn="8 / 9"
-      gridRow="1 / 3"
-    />
-  );
+  const isPlayer2 = userKey === game?.player2Id;
   return (
     <div
       style={{
@@ -66,41 +51,20 @@ const BoardView: FunctionComponent<{
         background: theme.boardColor,
       }}
     >
-      {userKey === game?.player2Id ? (
-        <>
-          <StoreView
-            context={context}
-            pitViewModel={player1BankViewModel}
-            gridColumn="1 / 2"
-            gridRow="1 / 3"
-          />
-          <StoreView
-            context={context}
-            pitViewModel={player2BankViewModel}
-            gridColumn="8 / 9"
-            gridRow="1 / 3"
-          />
-          {player1Pits?.reverse()}
-          {player2Pits}
-        </>
-      ) : (
-        <>
-          <StoreView
-            context={context}
-            pitViewModel={player1BankViewModel}
-            gridColumn="8 / 9"
-            gridRow="1 / 3"
-          />
-          <StoreView
-            context={context}
-            pitViewModel={player2BankViewModel}
-            gridColumn="1 / 2"
-            gridRow="1 / 3"
-          />
-          {player2Pits?.reverse()}
-          {player1Pits}
-        </>
-      )}
+      <StoreView
+        context={context}
+        pitViewModel={isPlayer2 ? player2BankViewModel : player1BankViewModel}
+        gridColumn="8 / 9"
+        gridRow="1 / 3"
+      />
+      <StoreView
+        context={context}
+        pitViewModel={isPlayer2 ? player1BankViewModel : player2BankViewModel}
+        gridColumn="1 / 2"
+        gridRow="1 / 3"
+      />
+      {isPlayer2 ? player1Pits?.reverse() : player2Pits?.reverse()}
+      {isPlayer2 ? player2Pits : player1Pits}
     </div>
   );
 };
diff --git a/src/components/board/StoneView.tsx b/src/components/board/StoneView.tsx
index 2b5e16a..fdae813 100644
--- a/src/components/board/StoneView.tsx
+++ b/src/components/board/StoneView.tsx
@@ -12,7 +12,7 @@ const StoneView: FunctionComponent<{ color: string }> = ({ color }) => {
           borderRadius: "10vw",
           transition: "background-color 0.5s",
         }}
-      ></div>
+      />
     );
   };
 
diff --git a/src/util/Util.ts b/src/util/Util.ts
index 905b84d..5898bbf 100644
--- a/src/util/Util.ts
+++ b/src/util/Util.ts
@@ -1,7 +1,7 @@
 
 export default class Util {
     public static range(size: number) {
-        var ans = [];
+        var ans : number[] = [];
         for (let i = 0; i < size; i++) {
             ans.push(i);
         }