aboutsummaryrefslogtreecommitdiff
path: root/react-frontend/src/App.js
diff options
context:
space:
mode:
authorJulia McCauley <skurvyj@gmail.com>2021-04-17 14:03:33 -0400
committerJulia McCauley <skurvyj@gmail.com>2021-04-17 14:03:33 -0400
commit6d6e00d739c532a5cddb5344b261a9681bc9da0b (patch)
tree4ef8fe66e5971e33489ccc7e974982c6917a4b92 /react-frontend/src/App.js
parentfa4feff17c9e15b86388fd5ee1ac6771ff4d5148 (diff)
parentcdcf7602c5fd2066f69fdbe64562e2faca915422 (diff)
pulling latest version Mgerge branch 'master' of github.com:cs0320-2021/term-project-cohwille-jmccaul3-mfoiani-rhunt2
Diffstat (limited to 'react-frontend/src/App.js')
-rw-r--r--react-frontend/src/App.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/react-frontend/src/App.js b/react-frontend/src/App.js
index 2eb0c81..fd7d648 100644
--- a/react-frontend/src/App.js
+++ b/react-frontend/src/App.js
@@ -4,6 +4,7 @@ import TimeSelector from './components/TimeSelector.js';
import Visualization from './components/Visualization.js';
import HubList from './components/HubList.js';
import Loading from './components/Loading.js';
+import Modal from './components/Modal.js';
// CSS import
import './css/App.css';
@@ -50,6 +51,7 @@ function App() {
setIsChanging(false);
}
+
// Hooks to update data on init and switching of data
useEffect(() => getGraphData(), []);
useEffect(() => {
@@ -61,6 +63,7 @@ function App() {
<>
{(!hasLoaded) ? <Loading></Loading> :
<div className="App">
+ <Modal>PHP</Modal>
<header className="App-header">Welcome to WatchDogs!</header>
<div className="Canvas-filler Canvas-filler-1"></div>
<div className="Canvas-filler Canvas-filler-2"></div>