Merge branch 'master' into nginx_setup

Author: Dan Kelley

.gitignore

@@ -18,3 +18,4 @@ start_env.sh
 
 /src/server/venv/
 /src/local_files/
+/src/server/secrets.py

src/client/.gitignore

@@ -20,4 +20,4 @@
 
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log*

src/client/package-lock.json

@@ -9,6 +9,7 @@
         "@testing-library/jest-dom": "^4.2.4",
         "@testing-library/react": "^9.5.0",
         "@testing-library/user-event": "^7.2.1",
+        "lodash": "^4.17.20",
         "moment": "^2.29.1",
         "react": "^16.13.1",
         "react-dom": "^16.13.1",

src/client/package.json

@@ -1,5 +1,5 @@
-import  React from "react";
-import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
+import React from "react";
+import {BrowserRouter as Router, Switch, Route} from 'react-router-dom';
 
 import Header from "./components/Header";
 
@@ -8,29 +8,26 @@ import Admin from './pages/Admin';
 import DataView from './pages/DataView360/DataView360';
 import About from './pages/About';
 
-/*basic routing of the app*/ 
-export default function App(props){
-  return (
-    <Router>
+/*basic routing of the app*/
+export default function App(props) {
+    return (
+        <Router>
+            <Header/>
             <Switch>
-              <Route exact path="/">
-                <Header />
-                <HomePage />
-              </Route>
-              <Route path="/upload">
-                <Header />
-                <Admin />
-              </Route>
-              <Route path="/about">
-                <Header />
-                <About />
-              </Route>
-              <Route path="/dataView">
-                <Header />
-                <DataView />
-              </Route>
+                <Route exact path="/">
+                    <HomePage/>
+                </Route>
+                <Route path="/upload">
+                    <Admin/>
+                </Route>
+                <Route path="/about">
+                    <About/>
+                </Route>
+                <Route path="/dataView">
+                    <DataView/>
+                </Route>
             </Switch>
-    </Router>
-  );
+        </Router>
+    );
 }
 

src/client/src/App.js

@@ -175,15 +175,9 @@ class Admin extends Component {
         : _.isEmpty(this.state.statistics) !== true &&
         <TableContainer component={Paper} className="statisticsData">
             <Table aria-label="simple table" className={classes.table}>
-                <TableHead>
-                    <TableRow>
-                        <TableCell>Sources Matched</TableCell>
-                        <TableCell align="left">Number of Matches</TableCell>
-                    </TableRow>
-                </TableHead>
                 <TableBody>
-                {this.state.statistics.map((row) => (
-                    <TableRow key={row[0]}>
+                {this.state.statistics.map((row, index) => (
+                    <TableRow key={index}>
                     <TableCell align="left" component="th" scope="row">
                         {row[0]}
                     </TableCell>
@@ -195,7 +189,7 @@ class Admin extends Component {
         </TableContainer>
 
         return (
-            <div>
+            <div style={{paddingLeft: 20}}>
                 <h2>Admin Portal</h2>
                     <Grid container spacing={3} direction="column"  style={{padding:30}}>
                         <Grid container spacing={3} direction="row">