From 0b5c37a443c72ea5dbdf0a578693358c04a3ef67 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 7 Nov 2018 20:43:18 +0100 Subject: [PATCH] Linting the whole project first --- client/.eslintrc | 8 +++++++- client/package-lock.json | 28 ++++++++++++++-------------- client/src/auth/index.js | 2 +- client/src/graphql/apollo.js | 2 +- client/src/views/charts/index.js | 13 ++----------- client/src/views/header/LoggedIn.js | 5 ++--- client/src/views/home/index.js | 1 - 7 files changed, 27 insertions(+), 32 deletions(-) diff --git a/client/.eslintrc b/client/.eslintrc index 033b03754..fd6b2cc7d 100644 --- a/client/.eslintrc +++ b/client/.eslintrc @@ -5,5 +5,11 @@ "version": "16.0" } }, - "extends": ["standard", "standard-react"] + "extends": ["standard", "standard-react"], + "rules":{ + "react/prop-types": 0 + }, + "env": { + "browser": true + } } diff --git a/client/package-lock.json b/client/package-lock.json index 890570260..892787498 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4851,7 +4851,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -5024,7 +5024,7 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" } } @@ -5621,7 +5621,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -7703,7 +7703,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } @@ -8008,7 +8008,7 @@ }, "hoek": { "version": "4.2.1", - "resolved": "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "dev": true }, @@ -8107,7 +8107,7 @@ }, "html-webpack-harddisk-plugin": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-harddisk-plugin/-/html-webpack-harddisk-plugin-0.2.0.tgz", + "resolved": "http://registry.npmjs.org/html-webpack-harddisk-plugin/-/html-webpack-harddisk-plugin-0.2.0.tgz", "integrity": "sha1-RlQUpTQhm2nB/YEntYX42GiX+y0=", "dev": true, "requires": { @@ -8146,7 +8146,7 @@ }, "htmlparser2": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", + "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", "dev": true, "requires": { @@ -10622,7 +10622,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, @@ -15493,7 +15493,7 @@ }, "fast-deep-equal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, @@ -15737,7 +15737,7 @@ }, "fast-deep-equal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, @@ -16614,7 +16614,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -18407,7 +18407,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -19676,7 +19676,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, @@ -20000,7 +20000,7 @@ }, "topo": { "version": "2.0.2", - "resolved": "http://registry.npmjs.org/topo/-/topo-2.0.2.tgz", + "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "dev": true, "requires": { diff --git a/client/src/auth/index.js b/client/src/auth/index.js index 0d6be15bd..8cf36af36 100644 --- a/client/src/auth/index.js +++ b/client/src/auth/index.js @@ -228,7 +228,7 @@ class Auth { return user } - //TODO improve to check the session validation on client side + // TODO improve to check the session validation on client side const checkSSO = await this.checkSession() .then(result => { console.log('handleAuth.checksessions: ', result) diff --git a/client/src/graphql/apollo.js b/client/src/graphql/apollo.js index 006367f4d..3df4846bc 100644 --- a/client/src/graphql/apollo.js +++ b/client/src/graphql/apollo.js @@ -19,7 +19,7 @@ const authRetryLink = onError( if (graphQLErrors) { // User access token has expired // console.log('authLink: ', graphQLErrors) // check for error message to intercept and resend with Auth0 access token - if (graphQLErrors[0].message === 'Context creation failed: jwt expired') { + if (graphQLErrors[0].message === 'Context creation failed: jwt expired') { window.localStorage.clear() location.reload() } else if (graphQLErrors[0].message === 'Not logged in') { diff --git a/client/src/views/charts/index.js b/client/src/views/charts/index.js index 8cf31ef85..661f5f806 100644 --- a/client/src/views/charts/index.js +++ b/client/src/views/charts/index.js @@ -1,8 +1,5 @@ import React, { Component } from 'react' -import PropTypes from 'prop-types' -import CssBaseline from '@material-ui/core/CssBaseline' -import Typography from '@material-ui/core/Typography' import { withStyles } from '@material-ui/core/styles' import { connect } from 'react-redux' @@ -26,7 +23,6 @@ const styles = theme => ({ }) class Charts extends Component { - componentDidMount () { window.canvasApp.visible = true let body = document.getElementById('body') @@ -42,17 +38,12 @@ class Charts extends Component { } render () { - const { classes } = this.props return ( ) } } -Charts.propTypes = { - classes: PropTypes.object.isRequired -} - const mapStateToProps = (state) => { return { context: state.context @@ -61,8 +52,8 @@ const mapStateToProps = (state) => { const mapDispatchToProps = (dispatch) => { return { - hideFooter: () => { dispatch({type: 'HIDE_FOOTER'}) }, - showFooter: () => { dispatch({type: 'SHOW_FOOTER'}) } + hideFooter: () => { dispatch({ type: 'HIDE_FOOTER' }) }, + showFooter: () => { dispatch({ type: 'SHOW_FOOTER' }) } } } diff --git a/client/src/views/header/LoggedIn.js b/client/src/views/header/LoggedIn.js index be62994b7..81e99682f 100644 --- a/client/src/views/header/LoggedIn.js +++ b/client/src/views/header/LoggedIn.js @@ -7,7 +7,7 @@ import LoggedInMenu from './LoggedInMenu' import { isDefined } from '../../utils/js-helpers' export const LoggedIn = props => { - let { data, user, auth } = props + let { user, auth } = props let displayName = 'No Display Name' if (isDefined(user.alias)) { @@ -28,13 +28,12 @@ export const LoggedIn = props => { return (
- +
) } LoggedIn.propTypes = { - data: PropTypes.object, user: PropTypes.object.isRequired, auth: PropTypes.object.isRequired } diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js index 419275798..1944a87cc 100644 --- a/client/src/views/home/index.js +++ b/client/src/views/home/index.js @@ -25,7 +25,6 @@ const styles = theme => ({ }) class Home extends Component { - render () { const { classes } = this.props return (