diff --git a/.eslintrc.js b/.eslintrc.js index 26dbb5c..8097fb9 100755 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,19 +1,36 @@ +var IGNORE = 0 +var WARN = 1 +var ERROR = 2 + +var ALWAYS = 'always' +var NEVER = 'never' +var OFF = 'off' + module.exports = { extends: 'airbnb', parser: 'babel-eslint', - rules: { - // "jsx-curly-spacing": [2, "always", {"alternative": true}], // https://github.com/yannickcr/eslint-plugin-react/issues/388 - 'react/jsx-curly-spacing': [1, 'always'], - 'react/prop-types': [0], - 'template-curly-spacing': ['error', 'always'], - 'strict': [0, 'safe'], - 'no-unused-expressions': 0, - 'no-unused-vars': ['error', { 'vars': 'local' }], - 'arrow-body-style': [0, 'always'], - 'camelcase': [2, { 'properties': 'always' }], - 'constructor-super': 2, - 'quote-props': [2, 'consistent'], - 'no-underscore-dangle': [1], - 'semi': [2, 'never'] + env: { + browser: true, + node: true }, -}; + rules: { + 'react/jsx-curly-spacing': [ERROR, ALWAYS, { spacing: { objectLiterals: NEVER }}], + 'react/jsx-filename-extension': [IGNORE], + 'react/prop-types': [IGNORE], + 'template-curly-spacing': [ERROR, ALWAYS], + 'strict': [IGNORE], + 'no-unused-expressions': IGNORE, + 'no-unused-vars': [ERROR, { 'vars': 'local' }], + 'arrow-body-style': [IGNORE, ALWAYS], + 'camelcase': [ERROR], + 'constructor-super': ERROR, + 'quote-props': [ERROR, 'consistent'], + 'no-underscore-dangle': [WARN], + 'semi': [ERROR, NEVER], + 'import/no-unresolved': [ERROR, { ignore: ['electron'] }], + 'new-cap': [IGNORE], + 'import/no-named-as-default': [IGNORE], + 'import/no-extraneous-dependencies': [IGNORE], + 'jsx-a11y/no-static-element-interactions': IGNORE + } +} diff --git a/app/actions/UIActions.js b/app/actions/UIActions.js index 5ed3fe2..e0612e4 100644 --- a/app/actions/UIActions.js +++ b/app/actions/UIActions.js @@ -25,19 +25,5 @@ export function showComposerWithType(type) { } export function setOutput(output) { - console.log('inside ui actions', output) return { type: types.SET_OUTPUT, output } } - -// export function setActiveAlias(keyId) { -// return async function (dispatch) { -// try { -// delete db.object.activeAlias -// await db.write() -// const activeAlias = await db('activeAlias').insert(keyId) -// return dispatch({ type: types.SET_ACTIVE_ALIAS, activeAlias }) -// } catch (err) { -// console.log(err) -// } -// } -// } diff --git a/app/components/Felony.js b/app/components/Felony.js index 7d4eec1..9531a2c 100644 --- a/app/components/Felony.js +++ b/app/components/Felony.js @@ -1,5 +1,3 @@ -'use strict' - import 'normalize.css' import React, { Component } from 'react' import ReactCSS from 'reactcss' @@ -20,7 +18,7 @@ export class Felony extends Component { selected: [], // replaced with redux } - classes() { + classes() { // eslint-disable-line return { 'default': { app: { diff --git a/app/components/alias/Alias.js b/app/components/alias/Alias.js index c3e288d..605e7a6 100644 --- a/app/components/alias/Alias.js +++ b/app/components/alias/Alias.js @@ -1,14 +1,10 @@ -'use strict' - import React, { Component } from 'react' import ReactCSS from 'reactcss' import { User } from '../common/index' -import { generateKey } from '../../utils/pgp' - class Alias extends Component { - classes() { + classes() { // eslint-disable-line return { 'default': { user: { diff --git a/app/components/alias/AliasComposerForm.js b/app/components/alias/AliasComposerForm.js index c02f190..e0046e7 100644 --- a/app/components/alias/AliasComposerForm.js +++ b/app/components/alias/AliasComposerForm.js @@ -1,12 +1,10 @@ -'use strict' - import React, { Component } from 'react' import ReactCSS from 'reactcss' import colors from '../../assets/styles/variables/colors' class AliasComposer extends Component { - classes() { + classes() { // eslint-disable-line return { 'default': { text: { @@ -57,11 +55,10 @@ class AliasComposer extends Component { render() { return ( -
+