Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated deps and JS syntax changes for updated deps #107

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updated deps and JS syntax changes for updated deps #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 36 additions & 22 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,49 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^3.1.0",
"@material-ui/icons": "^3.0.1",
"@openchemistry/molecule-moljs": "^0.4.12",
"axios": "^0.18.0",
"connected-react-router": "^4.4.1",
"filesize": "^3.6.1",
"lodash": "^4.17.10",
"material-ui-search-bar": "^1.0.0-beta.8",
"moment": "^2.22.2",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@openchemistry/molecule-moljs": "^0.4.37",
"axios": "^1.4.0",
"connected-react-router": "^6.9.3",
"filesize": "^10.0.7",
"history": "^4.10.1",
"lodash": "^4.17.21",
"material-ui": "^0.20.2",
"material-ui-search-bar": "^1.0.0",
"moment": "^2.29.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-mathjax": "^1.0.1",
"react-redux": "^5.0.7",
"react-router-dom": "^4.3.1",
"react-scripts": "^1.1.4",
"react-twitter-embed": "^1.1.3",
"redux": "^4.0.0",
"redux-actions": "^2.6.1",
"redux-form": "^7.4.2",
"redux-form-material-ui": "^5.0.0-beta.3",
"react-redux": "^8.1.1",
"react-router-dom": "^5.3.4",
"react-scripts": "^5.0.1",
"react-twitter-embed": "^4.0.4",
"redux": "^4.2.1",
"redux-actions": "^3.0.0",
"redux-form": "^8.3.10",
"redux-form-material-ui": "^4.3.4",
"redux-logger": "^3.0.6",
"redux-saga": "^0.16.0",
"universal-cookie": "^3.0.4",
"uuid4": "^1.1.4"
"redux-saga": "^1.2.3",
"universal-cookie": "^4.0.4",
"uuid4": "^2.0.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
4 changes: 4 additions & 0 deletions client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, {Component} from 'react';

import { ConnectedRouter } from 'connected-react-router'
import { Route, Switch } from 'react-router'
// import { Routes, Route } from 'react-router'
import { history } from './store/configureStore';

import Drawer from '@material-ui/core/Drawer';
Expand Down Expand Up @@ -112,6 +113,7 @@ class App extends Component {
<div className={classes.contentContainer}>
<div className={classes.content}>
<Switch>
{/* <Routes> */}
<Route exact path='/' component={Welcome}/>
<PrivateRoute exact path='/my-datasets' component={MyDataSetsComponent}/>
<Route exact path='/dataset/:id' component={DatasetContainer}/>
Expand All @@ -129,6 +131,8 @@ class App extends Component {
<Route exact path='/tutorials' component={Tutorials}/>
<Route exact path='/download' component={Download}/>
<Route exact path='/validation' component={Validation}/>
{/* </Routes> */}

</Switch>
</div>
<div className={classes.footer}>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/deposit/fileField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import LinearProgress from '@material-ui/core/LinearProgress';

import { getUploadByFile } from '../../redux/selectors/upload'

import filesize from 'filesize';
import { filesize } from 'filesize';
import uuid4 from 'uuid4';

const style = (theme) => (
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/deposit/json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Button from '@material-ui/core/Button';

import TextField from '@material-ui/core/TextField';

import filesize from 'filesize';
import { filesize } from 'filesize';

const style = (theme) => (
{
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/header/mdb_logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions client/src/components/header/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class Menu extends Component {
{me ? me.login : 'user' }
<DropDownIcon />
</Button>
<Popover
{/* <Popover
open={this.state.open}
anchorEl={this.state.anchorEl}
anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
Expand All @@ -65,7 +65,7 @@ class Menu extends Component {
Sign out
</MenuItem>
</MenuList>
</Popover>
</Popover> */}
</div>

);
Expand Down