Merge branch 'master' of github.com:cs0320-2021/term-project-cohwille-jmccaul3-mfoiani-rhunt2

# Conflicts:
#	react-frontend/src/components/Visualization.js

1 files changed, 8 insertions, 8 deletions

diff --git a/react-frontend/src/components/WatchDogs.js b/react-frontend/src/components/WatchDogs.js
index d631ea9..dfe47c8 100644
--- a/react-frontend/src/components/WatchDogs.js
+++ b/react-frontend/src/components/WatchDogs.js
@@ -2,7 +2,7 @@
 import React, {useEffect, useState} from 'react';
 import TimeSelector from './TimeSelector.js';
 import Visualization from './Visualization.js';
-import HubList from './HubList.js';
+import HubWidget from './HubWidget.js';
 import Loading from './Loading.js';
 import Modal from './Modal.js';
 import logo from './images/logo.png';
@@ -26,8 +26,8 @@ function WatchDogs() {
   });
   // State for visualization data
   const [data, setData] = useState([]);
-  // State for selected person
-  const [selected, setSelected] = useState(-1);
+  // State for selectedId
+  const [selectedId, setSelectedId] = useState(-1);
 
   const toEpochMilli = date => Date.parse(date);
   const getGraphData = () => {
@@ -49,9 +49,9 @@ function WatchDogs() {
     .then(res  => res.json())
     .then(data => {
       //TODO: optimize this
-      const sliced = data.holders.slice(0, 500);
-      console.log(sliced);
-      setData(sliced);
+      //const sliced = data.holders.slice(0, 500);
+      //console.log(sliced);
+      setData(data.holders);
       setHasLoaded(true);
     })
     .catch(err => console.log(err));
@@ -77,9 +77,9 @@ function WatchDogs() {
           <div className="Canvas-filler Canvas-filler-1"></div>
           <div className="Canvas-filler Canvas-filler-2"></div>
           <div className="Canvas-filler Canvas-filler-3"></div>
-          <HubList setHasLoaded={setHasLoaded} data={data} setSelected={setSelected} selected={selected} dates={dates}></HubList>
+          <HubWidget setHasLoaded={setHasLoaded} data={data} dates={dates} selectedId={selectedId} setSelectedId={setSelectedId}></HubWidget>
           <TimeSelector isChanging={isChanging} dates={dates} setDates={setDates}></TimeSelector>
-          <Visualization hasLoaded={hasLoaded} data={data} setSelected={setSelected}></Visualization>
+          <Visualization hasLoaded={hasLoaded} data={data.slice(0, 600)} setSelectedId={setSelectedId}></Visualization>
         </div>
       }
     </>