From eeab93e324e7ff46f8667aa78f246baec5ca0573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Folles=C3=B8?= <jonas@follesoe.no>
Date: Sun, 12 Apr 2020 13:43:32 +0200
Subject: [PATCH] Split app into multiple files and add routing

Needed to allow for multiple pages in same app.
---
 package-lock.json         | 102 ++++++++++++++++++++++++++++++++++++++
 package.json              |   1 +
 public/index.html         |   2 +-
 src/App.js                |  97 ++++--------------------------------
 src/AttackModifierDeck.js |  17 +++++++
 src/BattleGoalsDeck.js    |  72 +++++++++++++++++++++++++++
 src/Card.js               |  18 +++++++
 src/index.css             |   8 ++-
 src/index.js              |  20 +++++++-
 9 files changed, 244 insertions(+), 93 deletions(-)
 create mode 100644 src/AttackModifierDeck.js
 create mode 100644 src/BattleGoalsDeck.js
 create mode 100644 src/Card.js

diff --git a/package-lock.json b/package-lock.json
index d1d45a8..4b6175c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5970,6 +5970,11 @@
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
     },
+    "gud": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
+      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+    },
     "gzip-size": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
@@ -6100,6 +6105,19 @@
       "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
+    "history": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^3.0.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^1.0.1"
+      }
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -6110,6 +6128,14 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
+    "hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
+    },
     "hosted-git-info": {
       "version": "2.8.8",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
@@ -8494,6 +8520,16 @@
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz",
       "integrity": "sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY="
     },
+    "mini-create-react-context": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz",
+      "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==",
+      "requires": {
+        "@babel/runtime": "^7.4.0",
+        "gud": "^1.0.0",
+        "tiny-warning": "^1.0.2"
+      }
+    },
     "mini-css-extract-plugin": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
@@ -10968,6 +11004,52 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "react-router": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz",
+      "integrity": "sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "hoist-non-react-statics": "^3.1.0",
+        "loose-envify": "^1.3.1",
+        "mini-create-react-context": "^0.3.0",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.6.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "path-to-regexp": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        }
+      }
+    },
+    "react-router-dom": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz",
+      "integrity": "sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.2",
+        "react-router": "5.1.2",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      }
+    },
     "react-scripts": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.1.tgz",
@@ -11371,6 +11453,11 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
       "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
     },
+    "resolve-pathname": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
+    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -12855,6 +12942,16 @@
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
     },
+    "tiny-invariant": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
+      "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
+    },
+    "tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -13235,6 +13332,11 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "value-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/package.json b/package.json
index 5bac97e..f3129a4 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "@testing-library/user-event": "^7.2.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-router-dom": "^5.1.2",
     "react-scripts": "3.4.1"
   },
   "scripts": {
diff --git a/public/index.html b/public/index.html
index c70fa23..5fbab7a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -34,7 +34,7 @@
       }
     </style>
   </head>
-  <body class="background-map">
+  <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--
diff --git a/src/App.js b/src/App.js
index 19c0cbc..77a4f76 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,7 +1,9 @@
 import React from 'react';
+import BattleGoalsDeck from './BattleGoalsDeck';
+import Card from './Card';
 import './App.css';
 
-class App extends React.Component {
+class ItemsApp extends React.Component {
   constructor(props) {
     super(props);
     this.state = { itemsDeckTo: 14 };
@@ -13,77 +15,20 @@ class App extends React.Component {
   }
   render() {
     return (
-      <div className="App">
-        <header className="m-8">
+      <div class="background-map h-screen">
+        <header>
           <label>
-            Available items: 
+            Available items:
             <input type="number" min="1" max="164" value={this.state.itemsDeckTo} onChange={this.handleChange} />
           </label>
         </header>
         <ItemsDeck to={this.state.itemsDeckTo} />
-        <BattleGoals />
+        <BattleGoalsDeck />
       </div>
     );
   }
 }
 
-class BattleGoals extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      deck: [],
-      shuffledDeck: [],
-      drawnDeck: []
-    };
-    this.drawCard = this.drawCard.bind(this);
-  }
-  componentDidMount() {
-    fetch(process.env.PUBLIC_URL + '/gloomhaven/data/battle-goals.js')
-      .then(res => res.json())
-      .then(
-        (result) => {
-          const deck = result.filter(c => c.name !== 'battlegoal-back');
-          this.setState({ 
-            deck: deck,
-            shuffledDeck: shuffleDeck(deck),
-            drawnDeck: []
-          });
-        },
-        (error) => {
-          console.error(error);
-        }
-      )
-  }
-  drawCard() {
-    const shuffledDeck = this.state.shuffledDeck.length > 0 ?
-      this.state.shuffledDeck : shuffleDeck(this.state.deck);
-
-    const drawnDeck = this.state.shuffledDeck.length > 0 ?
-      this.state.drawnDeck : [];
-
-    this.setState({
-      deck: this.state.deck,
-      drawnDeck: [shuffledDeck[0], ...drawnDeck],
-      shuffledDeck: [...shuffledDeck.slice(1)]
-    });
-  }
-  render() {
-    const drawnCards = this.state.drawnDeck.map((card) =>
-      <Card key={card.name} image={process.env.PUBLIC_URL + '/gloomhaven/images/' + card.image } name={card.name} />
-    );
-
-    return (
-      <div className="flex flex-wrap flex-row m-6">
-        <Card 
-          name="Draw Battle Card" 
-          onClick={this.drawCard}
-          image={process.env.PUBLIC_URL + '/gloomhaven/images/battle-goals/battlegoal-back.png' } />
-        {drawnCards}
-      </div>
-    )
-  }
-}
-
 class ItemsDeck extends React.Component {
   constructor(props) {
     super(props);
@@ -105,7 +50,7 @@ class ItemsDeck extends React.Component {
                 image: process.env.PUBLIC_URL + '/gloomhaven/images/' + card.image
               }
             });
-          this.setState({ 
+          this.setState({
             deck: cards
           });
         },
@@ -126,28 +71,4 @@ class ItemsDeck extends React.Component {
   }
 }
 
-function Card(props) {
-  function handleClick(e) {
-    e.preventDefault();
-    if (props.onClick) {
-      props.onClick(props.name);
-    }
-  }
-  return (
-    <div className="m-2 Card" onClick={handleClick}>
-      <img className="Card-face" src={props.image} alt={props.name} />
-    </div>
-  );
-}
-
-// Fisher–Yates shuffle
-function shuffleDeck(deck) {
-  var newDeck = [...deck];
-    for (let i = newDeck.length - 1; i > 0; i--) {
-      const j = Math.floor(Math.random() * (i + 1));
-      [newDeck[i], newDeck[j]] = [newDeck[j], newDeck[i]];
-    }
-  return newDeck;
-}
-
-export default App;
+export default ItemsApp;
diff --git a/src/AttackModifierDeck.js b/src/AttackModifierDeck.js
new file mode 100644
index 0000000..98950eb
--- /dev/null
+++ b/src/AttackModifierDeck.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import BattleGoalsDeck from './BattleGoalsDeck';
+
+class AttackModifierDeck extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    return (
+      <div className="bg-greenscreen h-screen">
+        <BattleGoalsDeck />
+      </div>
+      )
+  }
+}
+
+export default AttackModifierDeck;
diff --git a/src/BattleGoalsDeck.js b/src/BattleGoalsDeck.js
new file mode 100644
index 0000000..ea3ab5a
--- /dev/null
+++ b/src/BattleGoalsDeck.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import Card from './Card';
+import './App.css';
+
+class BattleGoalsDeck extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      deck: [],
+      shuffledDeck: [],
+      drawnDeck: []
+    };
+    this.drawCard = this.drawCard.bind(this);
+  }
+  componentDidMount() {
+    fetch(process.env.PUBLIC_URL + '/gloomhaven/data/battle-goals.js')
+      .then(res => res.json())
+      .then(
+        (result) => {
+          const deck = result.filter(c => c.name !== 'battlegoal-back');
+          this.setState({
+            deck: deck,
+            shuffledDeck: shuffleDeck(deck),
+            drawnDeck: []
+          });
+        },
+        (error) => {
+          console.error(error);
+        }
+      )
+  }
+  drawCard() {
+    const shuffledDeck = this.state.shuffledDeck.length > 0 ?
+      this.state.shuffledDeck : shuffleDeck(this.state.deck);
+
+    const drawnDeck = this.state.shuffledDeck.length > 0 ?
+      this.state.drawnDeck : [];
+
+    this.setState({
+      deck: this.state.deck,
+      drawnDeck: [shuffledDeck[0], ...drawnDeck],
+      shuffledDeck: [...shuffledDeck.slice(1)]
+    });
+  }
+  render() {
+    const drawnCards = this.state.drawnDeck.map((card) =>
+      <Card key={card.name} image={process.env.PUBLIC_URL + '/gloomhaven/images/' + card.image } name={card.name} />
+    );
+
+    return (
+      <div className="flex flex-wrap flex-row">
+        <Card
+          name="Draw Battle Card"
+          onClick={this.drawCard}
+          image={process.env.PUBLIC_URL + '/gloomhaven/images/battle-goals/battlegoal-back.png' } />
+        {drawnCards}
+      </div>
+    )
+  }
+}
+
+// Fisher–Yates shuffle
+function shuffleDeck(deck) {
+  var newDeck = [...deck];
+    for (let i = newDeck.length - 1; i > 0; i--) {
+      const j = Math.floor(Math.random() * (i + 1));
+      [newDeck[i], newDeck[j]] = [newDeck[j], newDeck[i]];
+    }
+  return newDeck;
+}
+
+export default BattleGoalsDeck;
diff --git a/src/Card.js b/src/Card.js
new file mode 100644
index 0000000..deeca0a
--- /dev/null
+++ b/src/Card.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import './App.css';
+
+function Card(props) {
+  function handleClick(e) {
+    e.preventDefault();
+    if (props.onClick) {
+      props.onClick(props.name);
+    }
+  }
+  return (
+    <div className="m-2 Card" onClick={handleClick}>
+      <img className="Card-face" src={props.image} alt={props.name} />
+    </div>
+  );
+}
+
+export default Card;
diff --git a/src/index.css b/src/index.css
index 392a8f6..127471d 100644
--- a/src/index.css
+++ b/src/index.css
@@ -8,7 +8,7 @@ body {
   color: white;
   outline: black;
 }
-  
+
 code {
   font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
     monospace;
@@ -30,4 +30,8 @@ input[type='number'] {
 
 input:focus {
   outline: none;
-}
\ No newline at end of file
+}
+
+.bg-greenscreen {
+  background-color: #00ff00;
+}
diff --git a/src/index.js b/src/index.js
index f5185c1..1c98adb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,12 +1,28 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import {
+  BrowserRouter as Router,
+  Switch,
+  Route,
+  Link
+} from "react-router-dom";
 import './index.css';
-import App from './App';
+import ItemsApp from './App';
+import AttackModifierDeck from './AttackModifierDeck';
 import * as serviceWorker from './serviceWorker';
 
 ReactDOM.render(
   <React.StrictMode>
-    <App />
+    <Router>
+      <Switch>
+        <Route path="/monster">
+          <AttackModifierDeck />
+        </Route>
+        <Route exact path="/">
+          <ItemsApp />
+        </Route>
+      </Switch>
+    </Router>
   </React.StrictMode>,
   document.getElementById('root')
 );