From 5c0272fc2d722083b4cb60de4b9159ae3204681d Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Mon, 13 Apr 2020 18:29:46 +1000
Subject: [PATCH] Moved join screen to a modal

---
 src/App.js                                  |  4 ---
 src/components/Modal.js                     |  3 ++-
 src/{routes/Join.js => modals/JoinModal.js} | 30 +++++++++++----------
 src/routes/Home.js                          | 14 ++++++----
 4 files changed, 27 insertions(+), 24 deletions(-)
 rename src/{routes/Join.js => modals/JoinModal.js} (69%)

diff --git a/src/App.js b/src/App.js
index ac1b803..f5afa39 100644
--- a/src/App.js
+++ b/src/App.js
@@ -5,7 +5,6 @@ import { HashRouter as Router, Switch, Route } from "react-router-dom";
 import theme from "./theme.js";
 import Home from "./routes/Home";
 import Game from "./routes/Game";
-import Join from "./routes/Join";
 import About from "./routes/About";
 import FAQ from "./routes/FAQ";
 
@@ -20,9 +19,6 @@ function App() {
           <Route path="/faq">
             <FAQ />
           </Route>
-          <Route path="/join">
-            <Join />
-          </Route>
           <Route path="/game/:id">
             <Game />
           </Route>
diff --git a/src/components/Modal.js b/src/components/Modal.js
index 79c23d6..1b9bd00 100644
--- a/src/components/Modal.js
+++ b/src/components/Modal.js
@@ -2,7 +2,7 @@ import React from "react";
 import Modal from "react-modal";
 import { useThemeUI, Close } from "theme-ui";
 
-function StyledModal({ isOpen, onRequestClose, children }) {
+function StyledModal({ isOpen, onRequestClose, children, ...props }) {
   const { theme } = useThemeUI();
 
   return (
@@ -22,6 +22,7 @@ function StyledModal({ isOpen, onRequestClose, children }) {
           maxHeight: "100%",
         },
       }}
+      {...props}
     >
       {children}
       <Close
diff --git a/src/routes/Join.js b/src/modals/JoinModal.js
similarity index 69%
rename from src/routes/Join.js
rename to src/modals/JoinModal.js
index 25f055f..c28d655 100644
--- a/src/routes/Join.js
+++ b/src/modals/JoinModal.js
@@ -1,10 +1,10 @@
-import React, { useState } from "react";
+import React, { useState, useRef } from "react";
 import { Box, Label, Input, Button, Flex } from "theme-ui";
 import { useHistory } from "react-router-dom";
 
-import Footer from "../components/Footer";
+import Modal from "../components/Modal";
 
-function Join() {
+function JoinModal({ isOpen, onRequestClose }) {
   let history = useHistory();
   const [gameId, setGameId] = useState("");
 
@@ -17,14 +17,16 @@ function Join() {
     history.push(`/game/${gameId}`);
   }
 
+  const inputRef = useRef();
+  function focusInput() {
+    inputRef.current && inputRef.current.focus();
+  }
+
   return (
-    <Flex
-      sx={{
-        flexDirection: "column",
-        justifyContent: "space-between",
-        minHeight: "100%",
-        alignItems: "center",
-      }}
+    <Modal
+      isOpen={isOpen}
+      onRequestClose={onRequestClose}
+      onAfterOpen={focusInput}
     >
       <Flex
         sx={{
@@ -33,7 +35,7 @@ function Join() {
           maxWidth: "300px",
           flexGrow: 1,
         }}
-        mb={2}
+        m={2}
       >
         <Box as="form" onSubmit={handleSubmit}>
           <Label htmlFor="id">Let me see your identification</Label>
@@ -44,13 +46,13 @@ function Join() {
             name="id"
             value={gameId || ""}
             onChange={handleChange}
+            ref={inputRef}
           />
           <Button disabled={!gameId}>Join › (ﾉ◕ヮ◕)ﾉ*:･ﾟ✧</Button>
         </Box>
       </Flex>
-      <Footer />
-    </Flex>
+    </Modal>
   );
 }
 
-export default Join;
+export default JoinModal;
diff --git a/src/routes/Home.js b/src/routes/Home.js
index 5072e3c..f9ffddd 100644
--- a/src/routes/Home.js
+++ b/src/routes/Home.js
@@ -1,10 +1,12 @@
-import React from "react";
+import React, { useState } from "react";
 import { Flex, Button, Image, Text } from "theme-ui";
 import shortid from "shortid";
 import { useHistory } from "react-router-dom";
 
 import Footer from "../components/Footer";
 
+import JoinModal from "../modals/JoinModal";
+
 import owlington from "../images/Owlington.png";
 
 function Home() {
@@ -13,9 +15,7 @@ function Home() {
     history.push(`/game/${shortid.generate()}`);
   }
 
-  function handleJoinGame() {
-    history.push("/join");
-  }
+  const [isJoinModalOpen, setIsJoinModalOpen] = useState(false);
 
   return (
     <Flex
@@ -42,12 +42,16 @@ function Home() {
         <Button m={2} onClick={handleStartGame}>
           Start Game
         </Button>
-        <Button m={2} onClick={handleJoinGame}>
+        <Button m={2} onClick={() => setIsJoinModalOpen(true)}>
           Join Game
         </Button>
         <Text variant="caption" as="p" sx={{ textAlign: "center" }}>
           Alpha v0.8.0
         </Text>
+        <JoinModal
+          isOpen={isJoinModalOpen}
+          onRequestClose={() => setIsJoinModalOpen(false)}
+        />
       </Flex>
       <Footer />
     </Flex>