From 73f83293a003d4da2457919389a0ddae605e5d5d Mon Sep 17 00:00:00 2001
From: Galen Guyer <galen@galenguyer.com>
Date: Sat, 14 Nov 2020 13:37:11 -0500
Subject: pop most data into MainPage for router

---
 src/App.js      | 61 ++-----------------------------------------------
 src/MainPage.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 59 deletions(-)
 create mode 100644 src/MainPage.js

(limited to 'src')

diff --git a/src/App.js b/src/App.js
index 734ee62..e456b5c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,6 +1,6 @@
 import useSWR from "swr";
 import { DateTime } from "luxon";
-import Card from "./Card";
+import MainPage from "./MainPage";
 import "./App.css";
 
 const url = "https://rcpoller.galenguyer.com/api/v0/history";
@@ -43,64 +43,7 @@ function App() {
             </h3>
             <br />
             <br />
-            <div id="total">
-                <h4 className="text-2xl">Total Positive Cases Since August 19 (First Day of Classes)</h4>
-                <div className="Section">
-                    <Card name="Students" latest={latest.total_students} prior={prior.total_students} />
-                    <Card name="Staff" latest={latest.total_staff} prior={prior.total_staff} />
-                </div>
-            </div>
-            <br />
-            <div id="new">
-                <h4 className="text-2xl">New Positive Cases From Past 14 Days</h4>
-
-                <div className="Section">
-                    <Card name="Students" latest={latest.new_students} prior={prior.new_students} />
-                    <Card name="Staff" latest={latest.new_staff} prior={prior.new_staff} />
-                </div>
-            </div>
-            <br />
-            <div id="quarantine">
-                <h4 className="text-2xl">Number of Students in Quarantine</h4>
-                <h5 className="text-base">
-                    Quarantine separates and restricts the movement of people who were exposed to a contagious disease
-                    to see if they become sick.
-                </h5>
-                <div className="Section">
-                    <Card name="On Campus" latest={latest.quarantine_on_campus} prior={prior.quarantine_on_campus} />
-                    <Card name="Off Campus" latest={latest.quarantine_off_campus} prior={prior.quarantine_off_campus} />
-                </div>
-            </div>
-            <br />
-            <div id="isolation">
-                <h4 className="text-2xl">Number of Students in Isolation</h4>
-                <h5 className="text-base">
-                    Isolation separates sick people with a contagious disease from people who are not sick.
-                </h5>
-                <div className="Section">
-                    <Card name="On Campus" latest={latest.isolation_on_campus} prior={prior.isolation_on_campus} />
-                    <Card name="Off Campus" latest={latest.isolation_off_campus} prior={prior.isolation_off_campus} />
-                </div>
-            </div>
-            <br />
-            <div id="tests">
-                <h4 className="text-2xl">Number of Tests Administered by Student Health Center</h4>
-                <div className="Section">
-                    <Card name="Tests to date" latest={latest.tests_administered} prior={prior.tests_administered} />
-                </div>
-            </div>
-            <br />
-            <div id="beds">
-                <h4 className="text-2xl">Quarantine/Isolation Bed Availability On-campus</h4>
-                <div className="Section">
-                    <Card
-                        name="Beds Available"
-                        latest={latest.beds_available}
-                        prior={prior.beds_available}
-                        suffix="%"
-                    />
-                </div>
-            </div>
+            <MainPage latest={latest} prior={prior} />
         </div>
     );
 }
diff --git a/src/MainPage.js b/src/MainPage.js
new file mode 100644
index 0000000..3ce4c22
--- /dev/null
+++ b/src/MainPage.js
@@ -0,0 +1,71 @@
+import React from "react";
+import Card from "./Card";
+
+const MainPage = (props) => {
+    const latest = props.latest;
+    const prior = props.prior;
+
+    return (
+        <>
+            <div id="total">
+                <h4 className="text-2xl">Total Positive Cases Since August 19 (First Day of Classes)</h4>
+                <div className="Section">
+                    <Card name="Students" latest={latest.total_students} prior={prior.total_students} />
+                    <Card name="Staff" latest={latest.total_staff} prior={prior.total_staff} />
+                </div>
+            </div>
+            <br />
+            <div id="new">
+                <h4 className="text-2xl">New Positive Cases From Past 14 Days</h4>
+                <div className="Section">
+                    <Card name="Students" latest={latest.new_students} prior={prior.new_students} />
+                    <Card name="Staff" latest={latest.new_staff} prior={prior.new_staff} />
+                </div>
+            </div>
+            <br />
+            <div id="quarantine">
+                <h4 className="text-2xl">Number of Students in Quarantine</h4>
+                <h5 className="text-base">
+                    Quarantine separates and restricts the movement of people who were exposed to a contagious disease
+                    to see if they become sick.
+                </h5>
+                <div className="Section">
+                    <Card name="On Campus" latest={latest.quarantine_on_campus} prior={prior.quarantine_on_campus} />
+                    <Card name="Off Campus" latest={latest.quarantine_off_campus} prior={prior.quarantine_off_campus} />
+                </div>
+            </div>
+            <br />
+            <div id="isolation">
+                <h4 className="text-2xl">Number of Students in Isolation</h4>
+                <h5 className="text-base">
+                    Isolation separates sick people with a contagious disease from people who are not sick.
+                </h5>
+                <div className="Section">
+                    <Card name="On Campus" latest={latest.isolation_on_campus} prior={prior.isolation_on_campus} />
+                    <Card name="Off Campus" latest={latest.isolation_off_campus} prior={prior.isolation_off_campus} />
+                </div>
+            </div>
+            <br />
+            <div id="tests">
+                <h4 className="text-2xl">Number of Tests Administered by Student Health Center</h4>
+                <div className="Section">
+                    <Card name="Tests to date" latest={latest.tests_administered} prior={prior.tests_administered} />
+                </div>
+            </div>
+            <br />
+            <div id="beds">
+                <h4 className="text-2xl">Quarantine/Isolation Bed Availability On-campus</h4>
+                <div className="Section">
+                    <Card
+                        name="Beds Available"
+                        latest={latest.beds_available}
+                        prior={prior.beds_available}
+                        suffix="%"
+                    />
+                </div>
+            </div>
+        </>
+    );
+};
+
+export default MainPage;
-- 
cgit v1.2.3