Merge pull request #10 from oslabs-beta/louis/new-feature

Re-organized structure of components

Author: llam722

src/app/components/ComponentMap.tsx renamed to src/app/components/StateRoute/ComponentMap/ComponentMap.tsx

@@ -18,8 +18,8 @@ import {
 } from '@visx/tooltip';
 import LinkControls from './LinkControls';
 import getLinkComponent from './getLinkComponent';
-import { toggleExpanded, setCurrentTabInApp } from '../actions/actions';
-import { useStoreContext } from '../store';
+import { toggleExpanded, setCurrentTabInApp } from '../../../actions/actions';
+import { useStoreContext } from '../../../store';
 
 const exclude = ['childExpirationTime', 'staticContext', '_debugSource', 'actualDuration', 'actualStartTime', 'treeBaseDuration', '_debugID', '_debugIsCurrentlyTiming', 'selfBaseDuration', 'expirationTime', 'effectTag', 'alternate', '_owner', '_store', 'get key', 'ref', '_self', '_source', 'firstBaseUpdate', 'updateQueue', 'lastBaseUpdate', 'shared', 'responders', 'pending', 'lanes', 'childLanes', 'effects', 'memoizedState', 'pendingProps', 'lastEffect', 'firstEffect', 'tag', 'baseState', 'baseQueue', 'dependencies', 'Consumer', 'context', '_currentRenderer', '_currentRenderer2', 'mode', 'flags', 'nextEffect', 'sibling', 'create', 'deps', 'next', 'destroy', 'parentSub', 'child', 'key', 'return', 'children', '$$typeof', '_threadCount', '_calculateChangedBits', '_currentValue', '_currentValue2', 'Provider', '_context', 'stateNode', 'elementType', 'type'];
 

src/app/components/LinkControls.tsx renamed to src/app/components/StateRoute/ComponentMap/LinkControls.tsx

@@ -5,8 +5,8 @@ import React, { useEffect } from 'react';
 import { diff, formatters } from 'jsondiffpatch';
 import * as d3 from 'd3';
 
-import { changeView, changeSlider, setCurrentTabInApp } from '../actions/actions';
-import { useStoreContext } from '../store';
+import { changeView, changeSlider, setCurrentTabInApp } from '../../actions/actions';
+import { useStoreContext } from '../../store';
 
 interface defaultMargin {
   top: number,

src/app/components/getLinkComponent.ts renamed to src/app/components/StateRoute/ComponentMap/getLinkComponent.ts

@@ -9,8 +9,8 @@ import { scaleBand, scaleLinear, scaleOrdinal } from '@visx/scale';
 import { useTooltip, useTooltipInPortal, defaultStyles } from '@visx/tooltip';
 import { Text } from '@visx/text';
 import { schemeSet3 } from 'd3-scale-chromatic';
-import { onHover, onHoverExit, save } from '../actions/actions';
-import { useStoreContext } from '../store';
+import { onHover, onHoverExit, save } from '../../../actions/actions';
+import { useStoreContext } from '../../../store';
 
 /* TYPESCRIPT */
 

src/app/components/History.tsx renamed to src/app/components/StateRoute/History.tsx

@@ -13,8 +13,8 @@ import { makeStyles } from '@material-ui/core/styles';
 import Select from '@material-ui/core/Select';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormControl from '@material-ui/core/FormControl';
-import { onHover, onHoverExit, deleteSeries, setCurrentTabInApp } from '../actions/actions';
-import { useStoreContext } from '../store';
+import { onHover, onHoverExit, deleteSeries, setCurrentTabInApp } from '../../../actions/actions';
+import { useStoreContext } from '../../../store';
 
 /* TYPESCRIPT */
 
@@ -53,7 +53,7 @@ interface BarGraphComparisonProps {
   setSeries: () => void,
   series: unknown,
   setAction: () => void,
-  }
+}
 
 /* DEFAULTS */
 const margin = {
@@ -293,7 +293,7 @@ const BarGraphComparison = (props: BarGraphComparisonProps): unknown => {
       </div>
 
       <svg ref={containerRef} width={width} height={height}>
-        {}
+        { }
         <rect
           x={0}
           y={0}
@@ -341,8 +341,8 @@ const BarGraphComparison = (props: BarGraphComparisonProps): unknown => {
                   height={bar.height === 0 ? null : bar.height}
                   width={bar.width}
                   fill={bar.color}
-                    /* TIP TOOL EVENT HANDLERS */
-                    // Hides tool tip once cursor moves off the current rect
+                  /* TIP TOOL EVENT HANDLERS */
+                  // Hides tool tip once cursor moves off the current rect
                   onMouseLeave={() => {
                     dispatch(
                       onHoverExit(data.componentData[bar.key].rtid),
@@ -351,7 +351,7 @@ const BarGraphComparison = (props: BarGraphComparisonProps): unknown => {
                       }, 300)),
                     );
                   }}
-                    // Cursor position in window updates position of the tool tip
+                  // Cursor position in window updates position of the tool tip
                   onMouseMove={event => {
                     dispatch(onHover(data.componentData[bar.key].rtid));
                     if (tooltipTimeout) clearTimeout(tooltipTimeout);
@@ -399,8 +399,8 @@ const BarGraphComparison = (props: BarGraphComparisonProps): unknown => {
                   height={bar.height === 0 ? null : bar.height}
                   width={bar.width}
                   fill={bar.color}
-                    /* TIP TOOL EVENT HANDLERS */
-                    // Hides tool tip once cursor moves off the current rect
+                  /* TIP TOOL EVENT HANDLERS */
+                  // Hides tool tip once cursor moves off the current rect
                   onMouseLeave={() => {
                     dispatch(
                       onHoverExit(data.componentData[bar.key].rtid),
@@ -409,7 +409,7 @@ const BarGraphComparison = (props: BarGraphComparisonProps): unknown => {
                       }, 300)),
                     );
                   }}
-                    // Cursor position in window updates position of the tool tip
+                  // Cursor position in window updates position of the tool tip
                   onMouseMove={event => {
                     dispatch(onHover(data.componentData[bar.key].rtid));
                     if (tooltipTimeout) clearTimeout(tooltipTimeout);

src/app/components/BarGraph.tsx renamed to src/app/components/StateRoute/PerformanceVisx/BarGraph.tsx

@@ -13,8 +13,8 @@ import { makeStyles } from '@material-ui/core/styles';
 import Select from '@material-ui/core/Select';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormControl from '@material-ui/core/FormControl';
-import { deleteSeries, setCurrentTabInApp } from '../actions/actions';
-import { useStoreContext } from '../store';
+import { deleteSeries, setCurrentTabInApp } from '../../../actions/actions';
+import { useStoreContext } from '../../../store';
 
 /* TYPESCRIPT */
 

src/app/components/BarGraphComparison.tsx renamed to src/app/components/StateRoute/PerformanceVisx/BarGraphComparison.tsx

@@ -13,8 +13,8 @@ import RenderingFrequency from './RenderingFrequency';
 import BarGraph from './BarGraph';
 import BarGraphComparison from './BarGraphComparison';
 import BarGraphComparisonActions from './BarGraphComparisonActions';
-import { useStoreContext } from '../store';
-import { setCurrentTabInApp } from '../actions/actions';
+import { useStoreContext } from '../../../store';
+import { setCurrentTabInApp } from '../../../actions/actions';
 
 
 interface BarStackProps {

src/app/components/BarGraphComparisonActions.tsx renamed to src/app/components/StateRoute/PerformanceVisx/BarGraphComparisonActions.tsx

@@ -2,8 +2,8 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 /* eslint-disable react/prop-types */
 import React, { useState, useEffect } from 'react';
-import { onHover, onHoverExit, setCurrentTabInApp } from '../actions/actions';
-import { useStoreContext } from '../store';
+import { onHover, onHoverExit, setCurrentTabInApp } from '../../../actions/actions';
+import { useStoreContext } from '../../../store';
 
 const RenderingFrequency = props => {
   const perfData = props.data;

src/app/components/PerformanceVisx.tsx renamed to src/app/components/StateRoute/PerformanceVisx/PerformanceVisx.tsx

@@ -14,11 +14,11 @@ import {
 } from 'react-router-dom';
 import { ParentSize } from '@visx/responsive';
 import Tree from './Tree';
-import ComponentMap from './ComponentMap';
-import { changeView, changeSlider } from '../actions/actions';
-import { useStoreContext } from '../store';
-import PerformanceVisx from './PerformanceVisx';
-import WebMetrics from './WebMetrics';
+import ComponentMap from './ComponentMap/ComponentMap';
+import { changeView, changeSlider } from '../../actions/actions';
+import { useStoreContext } from '../../store';
+import PerformanceVisx from './PerformanceVisx/PerformanceVisx';
+import WebMetrics from '../WebMetrics';
 
 const History = require('./History').default;