Skip to content

Commit adb5cbf

Browse files
committed
almost done with react router dom
1 parent ecdfad2 commit adb5cbf

File tree

4 files changed

+21
-28
lines changed

4 files changed

+21
-28
lines changed

src/app/components/DiffRoute.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// const DiffRoute = (props: DiffRouteProps): JSX.Element => (
1212
// <Router>
1313
// <div className='navbar'>
14-
// <NavLink className='router-link' activeClassName='is-active' exact to='/'>
14+
// <NavLink className='router-link' activeClassName='is-active' to='/'>
1515
// Tree
1616
// </NavLink>
1717
// <NavLink className='router-link' activeClassName='is-active' to='/diffRaw'>

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/* eslint-disable no-restricted-syntax */
44
/* eslint-disable max-len */
55
import React, { useState, useEffect } from 'react';
6-
import { MemoryRouter as Router, Route, NavLink, Routes, Navigate } from 'react-router-dom';
6+
import { MemoryRouter, Router, Route, NavLink, Routes, Navigate } from 'react-router-dom';
77
import RenderingFrequency from './RenderingFrequency';
88
import BarGraph from './BarGraph';
99
import BarGraphComparison from './BarGraphComparison';
@@ -309,27 +309,20 @@ const PerformanceVisx = (props: PerformanceVisxProps): JSX.Element => {
309309
<NavLink className='router-link-performance' end to='/'>
310310
Snapshots View
311311
</NavLink>
312-
<NavLink
313-
className='router-link-performance'
314-
id='router-link-performance-comparison'
315-
to='/comparison'
316-
>
312+
<NavLink className='router-link-performance' id='router-link-performance-comparison' to='/comparison'>
317313
Comparison View
318314
</NavLink>
319-
<NavLink
320-
className='router-link-performance'
321-
to='/componentdetails'
322-
>
315+
<NavLink className='router-link-performance' to='/componentdetails'>
323316
Component Details
324317
</NavLink>
325318
</div>
326319

327320
{renderForTutorial()}
328321

329322
<Routes>
330-
<Route exact path='/comparison' render={renderComparisonBargraph} />
331-
<Route exact path='/componentdetails' render={renderComponentDetailsView} />
332-
<Route exact path='/' render={renderBargraph} />
323+
<Route path='/comparison' render={renderComparisonBargraph} />
324+
<Route path='/componentdetails' render={renderComponentDetailsView} />
325+
<Route path='/' render={renderBargraph} />
333326
</Routes>
334327
</Router>
335328
);

src/app/components/StateRoute/StateRoute.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* eslint-disable max-len */
77
/* eslint-disable object-curly-newline */
88
import React from 'react';
9-
import { MemoryRouter as Router, Route, NavLink, Routes } from 'react-router-dom';
9+
import { MemoryRouter, Router, Route, NavLink, Routes } from 'react-router-dom';
1010
import { ParentSize } from '@visx/responsive';
1111
import Tree from './Tree';
1212
import ComponentMap from './ComponentMap/ComponentMap';
@@ -228,28 +228,28 @@ const StateRoute = (props: StateRouteProps) => {
228228
return (
229229
<Router>
230230
<div className='navbar'>
231-
<NavLink className='router-link map-tab' end to='/'>
232-
Map
233-
</NavLink>
234-
<NavLink className='router-link performance-tab' to='/performance'>
231+
<NavLink to='/performance' className='router-link performance-tab'>
235232
Performance
236233
</NavLink>
237-
<NavLink className='router-link history-tab' to='/history'>
234+
<NavLink to='/history' className='router-link history-tab'>
238235
History
239236
</NavLink>
240-
<NavLink className='router-link web-metrics-tab' to='/webMetrics'>
237+
<NavLink to='/webMetrics' className='router-link web-metrics-tab'>
241238
Web Metrics
242239
</NavLink>
243-
<NavLink className='router-link tree-tab' to='/tree'>
240+
<NavLink to='/tree' className='router-link tree-tab'>
244241
Tree
245242
</NavLink>
243+
<NavLink to='/' className='router-link map-tab' end>
244+
Map
245+
</NavLink>
246246
</div>
247247
<Routes>
248-
<Route exact path='/performance' render={renderPerfView} />
249-
<Route exact path='/history' render={renderHistory} />
250-
<Route exact path='/webMetrics' render={renderWebMetrics} />
251-
<Route exact path='/tree' render={renderTree} />
252-
<Route exact path='/' render={renderComponentMap} />
248+
<Route to='/performance' render={renderPerfView} />
249+
<Route to='/history' render={renderHistory} />
250+
<Route to='/webMetrics' render={renderWebMetrics} />
251+
<Route to='/tree' render={renderTree} />
252+
<Route to='/' render={renderComponentMap} />
253253
</Routes>
254254
</Router>
255255
);

src/app/containers/StateContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const StateContainer = (props: StateContainerProps): JSX.Element => {
2525
{/* <div className='main-navbar-container'>
2626
<div className='main-navbar-text' />
2727
<div className='main-navbar'>
28-
<NavLink className='main-router-link' activeClassName='is-active' exact to='/'>
28+
<NavLink className='main-router-link' activeClassName='is-active' to='/'>
2929
State
3030
</NavLink>
3131
<NavLink className='main-router-link' activeClassName='is-active' to='/diff'>

0 commit comments

Comments
 (0)