Skip to content

Commit

Permalink
Updated react-router-dom and fixed emerging bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Westerlund committed Mar 12, 2022
1 parent 02752a7 commit 6bb15a1
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 224 deletions.
143 changes: 30 additions & 113 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"react-redux": "^7.2.6",
"react-resizable": "^1.7.5",
"react-resizable-box": "^2.1.0",
"react-router-dom": "^4.3.1",
"react-router-dom": "^6.2.2",
"react-scripts": "^5.0.0",
"react-timeseries-charts": "^0.16.1",
"recharts": "^2.1.9",
Expand Down
13 changes: 5 additions & 8 deletions src/VasagatanTracker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Year from './pages/Year';
import { HashRouter as Router, Route, Redirect } from 'react-router-dom';
import { HashRouter as Router, Route, Routes, Navigate } from 'react-router-dom';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import { blueGrey } from '@mui/material/colors';
import CssBaseline from '@mui/material/CssBaseline';
Expand Down Expand Up @@ -32,13 +32,10 @@ class VasagatanTracker extends React.Component {
<CssBaseline />
<ThemeProvider theme={theme}>
<Router>
<div>
<Route exact path='/' render={() => <Redirect to={`/year/${year}`}/>}/>
<Route path='/year/:year' render={({ match }) =>
<Year store={this.props.store} year={match.params.year}/>
}>
</Route>
</div>
<Routes>
<Route path='/' element={<Navigate to={`/year/${year}`}/>}/>
<Route path='/year/:year/*' element={<Year store={this.props.store}/>}/>
</Routes>
</Router>
</ThemeProvider>
</div>
Expand Down
5 changes: 5 additions & 0 deletions src/components/Feat.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ class Feat extends React.Component {
return <Slide direction="up" {...props} />;
};

Transition = React.forwardRef(function Transition(props, ref) {
return <Slide direction="up" ref={ref} {...props} />;
});


render() {
const state = this.props.store.getState();
const user = state.user;
Expand Down
Loading

0 comments on commit 6bb15a1

Please sign in to comment.