Skip to content

Commit

Permalink
Update various packages and fix eslint-parser
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Westerlund committed Mar 7, 2022
1 parent b4f694a commit 02752a7
Show file tree
Hide file tree
Showing 8 changed files with 367 additions and 319 deletions.
8 changes: 7 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ module.exports = {
"node": true,
"browser": true
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"requireConfigFile": false,
"babelOptions": {
"presets": ["@babel/preset-react"]
}
},
"extends": "eslint:recommended",
"rules": {
"indent": [
Expand Down
64 changes: 62 additions & 2 deletions package-lock.json

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

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,13 @@
},
"proxy": "http://localhost:3001",
"devDependencies": {
"@babel/core": "^7.17.5",
"@babel/eslint-parser": "^7.17.0",
"@babel/preset-react": "^7.16.7",
"babel-eslint": "^10.1.0",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.9.1"
"enzyme-adapter-react-16": "^1.9.1",
"eslint": "^8.10.0"
},
"browserslist": [
">0.2%",
Expand Down
13 changes: 6 additions & 7 deletions src/VasagatanTracker.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React from 'react';
import Year from './pages/Year';
import { HashRouter as Router, Route, Redirect } from 'react-router-dom';
import { createMuiTheme } from '@mui/material/styles';
import MuiThemeProvider from '../node_modules/@mui/material/es/styles/MuiThemeProvider';
import blueGrey from '@mui/material/colors/blueGrey';
import CssBaseline from '../node_modules/@mui/material/CssBaseline/CssBaseline';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import { blueGrey } from '@mui/material/colors';
import CssBaseline from '@mui/material/CssBaseline';

const theme = createMuiTheme({
const theme = createTheme({
palette: {
primary: {
main: '#ff6cac',
Expand All @@ -31,7 +30,7 @@ class VasagatanTracker extends React.Component {
return (
<div>
<CssBaseline />
<MuiThemeProvider theme={theme}>
<ThemeProvider theme={theme}>
<Router>
<div>
<Route exact path='/' render={() => <Redirect to={`/year/${year}`}/>}/>
Expand All @@ -41,7 +40,7 @@ class VasagatanTracker extends React.Component {
</Route>
</div>
</Router>
</MuiThemeProvider>
</ThemeProvider>
</div>
);
}
Expand Down
Loading

0 comments on commit 02752a7

Please sign in to comment.