aboutsummaryrefslogtreecommitdiff
path: root/react-frontend/src/App.js
diff options
context:
space:
mode:
authorJulia McCauley <skurvyj@gmail.com>2021-04-17 21:13:32 -0400
committerJulia McCauley <skurvyj@gmail.com>2021-04-17 21:13:32 -0400
commit36ff09cac4a5210dd66a02f291bc3c2e12738100 (patch)
tree649fdc7d2bd584285abb51acf8fab561b89fe76c /react-frontend/src/App.js
parent6d6e00d739c532a5cddb5344b261a9681bc9da0b (diff)
parent860ba5b0e34ecdd27d2ec081191ab5bf9b32524b (diff)
pulling latest changes Merge 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.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/react-frontend/src/App.js b/react-frontend/src/App.js
index fd7d648..34632eb 100644
--- a/react-frontend/src/App.js
+++ b/react-frontend/src/App.js
@@ -5,6 +5,7 @@ import Visualization from './components/Visualization.js';
import HubList from './components/HubList.js';
import Loading from './components/Loading.js';
import Modal from './components/Modal.js';
+import logo from './components/images/logo.png';
// CSS import
import './css/App.css';
@@ -64,7 +65,8 @@ function App() {
{(!hasLoaded) ? <Loading></Loading> :
<div className="App">
<Modal>PHP</Modal>
- <header className="App-header">Welcome to WatchDogs!</header>
+ <header id="in-app-logo-holder" className="App-header">
+ <img id="in-app-logo" src={logo} alt="logo"/></header>
<div className="Canvas-filler Canvas-filler-1"></div>
<div className="Canvas-filler Canvas-filler-2"></div>
<div className="Canvas-filler Canvas-filler-3"></div>