Skip to content
This repository has been archived by the owner on Oct 12, 2020. It is now read-only.

Commit

Permalink
Bump react from 15.5.4 to 16.4.1 in /custom-analytics-ui (#173)
Browse files Browse the repository at this point in the history
* Bump react from 15.5.4 to 16.4.1 in /custom-analytics-ui

Bumps [react](https://github.com/facebook/react) from 15.5.4 to 16.4.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](facebook/react@v15.5.4...v16.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump React to new major
  • Loading branch information
dependabot[bot] authored and peol committed Jul 2, 2018
1 parent c042e7e commit 7765987
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 84 deletions.
155 changes: 86 additions & 69 deletions custom-analytics-ui/package-lock.json

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

11 changes: 5 additions & 6 deletions custom-analytics-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
"dependencies": {
"deep-extend": "0.6.0",
"enigma.js": "2.2.1",
"material-ui": "0.18.3",
"material-ui": "0.20.1",
"picasso-plugin-q": "0.5.2",
"picasso.js": "0.5.2",
"prop-types": "15.6.2",
"react": "15.5.4",
"react-dom": "15.5.4",
"react-router-dom": "4.3.1",
"react-tap-event-plugin": "2.0.1"
"react": "16.4.1",
"react-dom": "16.4.1",
"react-router-dom": "4.3.1"
},
"devDependencies": {
"babel": "^6.1.18",
Expand All @@ -48,6 +47,6 @@
"html-webpack-plugin": "3.2.0",
"style-loader": "^0.18.2",
"url-loader": "^1.0.1",
"webpack": "3.8.1"
"webpack": "^3.8.1"
}
}
2 changes: 1 addition & 1 deletion custom-analytics-ui/src/components/acceptCookies.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ our use of cookies
open={open}
message={paragraph}
action="Close"
onActionTouchTap={onAccept}
onClick={onAccept}
onRequestClose={() => false}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion custom-analytics-ui/src/components/dashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export default class Dashboard extends React.Component {
</IconButton>
)}
>
<MenuItem primaryText="Clear All Selections" onTouchTap={this.clearSelections} />
<MenuItem primaryText="Clear All Selections" onClick={this.clearSelections} />
</IconMenu>
</ToolbarGroup>
</Toolbar>
Expand Down
5 changes: 1 addition & 4 deletions custom-analytics-ui/src/components/landingPage.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import React from 'react';
import { withRouter } from 'react-router-dom';
import RaisedButton from 'material-ui/RaisedButton';
import injectTapEventPlugin from 'react-tap-event-plugin';
import './landingPage.css';
import { colors, styles } from '../ui-constants';

injectTapEventPlugin();

const RedirectButton = withRouter(({ history }) => (
<RaisedButton label="Get started" onTouchTap={() => { history.push('/app'); }} style={styles.transparentBackground} backgroundColor={colors.blue} labelColor={colors.white} />
<RaisedButton label="Get started" onClick={() => { history.push('/app'); }} style={styles.transparentBackground} backgroundColor={colors.blue} labelColor={colors.white} />
));

export default function LandingPage() {
Expand Down
4 changes: 2 additions & 2 deletions custom-analytics-ui/src/components/login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ export default class Login extends React.Component {
<FlatButton
label="Cancel"
style={{ color: colors.darkBlue }}
onTouchTap={onCancel}
onClick={onCancel}
key={1}
/>,
<FlatButton
label="Sign in"
style={{ color: colors.darkBlue }}
onTouchTap={() => onLogin(username, password)}
onClick={() => onLogin(username, password)}
key={2}
/>,
];
Expand Down
2 changes: 1 addition & 1 deletion custom-analytics-ui/src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Assisted Prescription
</span>
</div>
)}
onTitleTouchTap={this.navigateToLandingPage}
onTitleClick={this.navigateToLandingPage}
zDepth={3}
iconElementRight={(
<div style={
Expand Down

0 comments on commit 7765987

Please sign in to comment.