cleaned up code, added timeout, etc

6 files changed, 59 insertions, 58 deletions

diff --git a/src/components/App.js b/src/components/App.js
index 5b13230..3217782 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -35,56 +35,54 @@ const App = () => {
   const [isHost, setIsHost] = useState(false);
   const [joinCode, setJoinCode] = useState();
 
-  return gameStarted ? (
+  return (
     <>
-      {showMessageBox && 
-        <MessageBox 
-          message={message} 
-          setShowMessage={setShowMessageBox}
-        />
-      }
+      {gameStarted ?
+        <>
+          {showMessageBox &&
+            <MessageBox
+              message={message}
+              setShowMessage={setShowMessageBox}
+            />
+          }
 
-      <ScoreBoard 
-        turn={turn} 
-        scoreX={scoreX} 
-        scoreO={scoreO}
-        multiplayer={multiplayer}
-        isHost={isHost}
-      />
+          <ScoreBoard
+            turn={turn}
+            scoreX={scoreX}
+            scoreO={scoreO}
+            multiplayer={multiplayer}
+            isHost={isHost}
+          />
 
-      {multiplayer ? <MultiplayerGrid 
-          turn={turn} 
-          isHost={isHost}
-          setTurn={setTurn} 
-          scoreX={scoreX} 
-          setScoreX={setScoreX} 
-          scoreO={scoreO} 
-          setScoreO={setScoreO} 
-          setMessage={setMessage} 
-          setShowMessage={setShowMessageBox}
-          joinCode={joinCode}
-        /> : <Grid 
-          turn={turn} 
-          setTurn={setTurn} 
-          scoreX={scoreX} 
-          setScoreX={setScoreX} 
-          scoreO={scoreO} 
-          setScoreO={setScoreO} 
-          setMessage={setMessage} 
-          setShowMessage={setShowMessageBox}
+          {multiplayer ? <MultiplayerGrid
+              turn={turn}
+              isHost={isHost}
+              setTurn={setTurn}
+              scoreX={scoreX}
+              setScoreX={setScoreX}
+              scoreO={scoreO}
+              setScoreO={setScoreO}
+              setMessage={setMessage}
+              setShowMessage={setShowMessageBox}
+              joinCode={joinCode}
+            /> : <Grid
+              turn={turn}
+              setTurn={setTurn}
+              scoreX={scoreX}
+              setScoreX={setScoreX}
+              scoreO={scoreO}
+              setScoreO={setScoreO}
+              setMessage={setMessage}
+              setShowMessage={setShowMessageBox}
+            />
+          }
+        </> : <GamemodeChooser
+          setMultiplayer={setMultiplayer}
+          setGameStarted={setGameStarted}
+          setIsHost={setIsHost}
+          setJoinCode={setJoinCode}
         />
       }
-
-      <Footer/>
-    </>
-  ) : (
-    <>
-      <GamemodeChooser
-        setMultiplayer={setMultiplayer}
-        setGameStarted={setGameStarted}
-        setIsHost={setIsHost}
-        setJoinCode={setJoinCode}
-      />
       <Footer/>
     </>
   );
diff --git a/src/components/MultiplayerGrid.js b/src/components/MultiplayerGrid.js
index 7cd3835..4260e9b 100644
--- a/src/components/MultiplayerGrid.js
+++ b/src/components/MultiplayerGrid.js
@@ -21,7 +21,7 @@ import { io } from 'socket.io-client';
 import Box from './Box';
 import './style.css';
 
-const socket = io("http://localhost:5000");
+const socket = io("https://ttt.vidhukant.com/api");
 
 const MultiplayerGrid = (props) => {
   // 0 is O, 1 is X, 2 is blank
@@ -36,9 +36,16 @@ const MultiplayerGrid = (props) => {
   // host/join room
   useEffect(() => {
     if (isHost) {
+      const timeout = setTimeout(() => {
+        setMessage("Server Timed Out After 5 Seconds");
+        setShowMessage(true);
+        setTimeout(() => window.location.reload(), 3000)
+      }, 5000);
+
       socket.emit("host");
 
       socket.on("broadcast code", (code) => {
+        clearTimeout(timeout);
         setMessage(`Game Code: ${code}`);
         setShowMessage(true);
       });
@@ -47,7 +54,7 @@ const MultiplayerGrid = (props) => {
         setMessage("Opponent Joined")
         setShowMessage(true)
         setTimeout(() => setShowMessage(false), 3000)
-      })
+      });
     } else {
       socket.emit("join", joinCode);
 
diff --git a/src/components/style.css b/src/components/style.css
index 79ef49e..ade1d46 100644
--- a/src/components/style.css
+++ b/src/components/style.css
@@ -35,8 +35,8 @@ body {
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  height: 90%;
-  width: 100%;
+  height: calc(100vh - 6rem);
+  width: 100vw;
 }
 
 .GamemodeChooser .GamemodeButton {
@@ -72,6 +72,7 @@ body {
   left: 0; right: 0;
   margin: 1rem auto;
   width: 30rem;
+  min-height: 9rem;
 }
 
 .ScoreBoard { 
@@ -82,6 +83,7 @@ body {
 }
 
 .Grid {
+  height: calc(100vh - 17rem);
   display: grid;
   grid-template-columns: 9rem 9rem 9rem;
   grid-template-rows: 9rem 9rem 9rem;
@@ -105,6 +107,7 @@ body {
 }
 
 .Footer {
+  min-height: 6rem;
   position: relative;
   bottom: 0;
   width: 100%;
diff --git a/src/logo.svg b/src/logo.svg
deleted file mode 100644
index 9dfc1c0..0000000
--- a/src/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5..0000000
--- a/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="react-scripts" />
diff --git a/src/server/index.js b/src/server/index.js
index 004c989..3c9d683 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,15 +1,13 @@
 const express = require('express');
 const app = express();
 const http = require('http').Server(app);
-const path = require('path');
 
 const io = require("socket.io")(http, {
   cors: {
     origin: [
       "http://localhost:5000", 
       "http://localhost:3000",
-      "https://mikunonaka-tic-tac-toe.herokuapp.com", 
-      "http://mikunonaka-tic-tac-toe.herokuapp.com"
+      "https://ttt.vidhukant.com",
     ],
     "Access-Control-Allow-Origin": "*",
     methods: ["GET", "POST"]
@@ -98,11 +96,8 @@ io.on('connection', (socket) => {
   });
 });
 
-// serve static front end
-app.use(express.static(path.join(__dirname, '../../build')));
-
 // Start the server
 const PORT = process.env.PORT || 5000;
 http.listen(PORT, () => {
-    console.log(`App listening on port ${PORT}`);
+  console.log(`App listening on port ${PORT}`);
 });