)
}
}
diff --git a/app/containers/App.js b/app/containers/App.js
index 98143ec..9801f8d 100755
--- a/app/containers/App.js
+++ b/app/containers/App.js
@@ -1,6 +1,6 @@
import React, { Component, PropTypes } from 'react'
-export default class App extends Component {
+export default class App extends Component { // eslint-disable-line
static propTypes = {
children: PropTypes.element.isRequired,
}
@@ -10,9 +10,9 @@ export default class App extends Component {
{ this.props.children }
{
- (() => {
+ (() => { // eslint-disable-line consistent-return
if (process.env.NODE_ENV !== 'production') {
- const DevTools = require('./DevTools')
+ const DevTools = require('./DevTools') // eslint-disable-line global-require
return
}
})()
diff --git a/app/containers/ComposerContainer.js b/app/containers/ComposerContainer.js
index e109afd..ece7285 100644
--- a/app/containers/ComposerContainer.js
+++ b/app/containers/ComposerContainer.js
@@ -1,11 +1,11 @@
import _ from 'lodash'
import { connect } from 'react-redux'
-import { toggleComposer, clearSelectedKeys, toggleGeneratingKey, addKey, setOutput } from '../actions/index'
+import { toggleComposer, toggleGeneratingKey, addKey, setOutput } from '../actions/index'
import Composer from '../components/composer/Composer'
const mapStateToProps = (state) => {
const keychain = state.keychainReducer.get('keychain').toJS()
- const aliases = _.filter(keychain, key => {
+ const aliases = _.filter(keychain, (key) => {
return key.privateKeyArmored !== null
})
const first = aliases[0] || null
@@ -17,7 +17,7 @@ const mapStateToProps = (state) => {
selectedKeychain: _.values(_.pick(keychain, (value, key) => {
return state.uiReducer.get('selectedKeychain').toJS()[key]
})),
- keychain: _.filter(keychain, key => {
+ keychain: _.filter(keychain, (key) => {
return key.privateKeyArmored === null
}),
alias: first,
@@ -46,7 +46,7 @@ const mapDispatchToProps = (dispatch) => {
const ComposerContainer = connect(
mapStateToProps,
- mapDispatchToProps
+ mapDispatchToProps,
)(Composer)
export default ComposerContainer
diff --git a/app/containers/DevTools.js b/app/containers/DevTools.js
index 7435d15..022ff0b 100755
--- a/app/containers/DevTools.js
+++ b/app/containers/DevTools.js
@@ -9,5 +9,5 @@ export default createDevTools(
changePositionKey="ctrl-q"
>
-
+ ,
)
diff --git a/app/containers/FloatingButtonContainer.js b/app/containers/FloatingButtonContainer.js
index 7ce807c..87dbe0e 100644
--- a/app/containers/FloatingButtonContainer.js
+++ b/app/containers/FloatingButtonContainer.js
@@ -17,7 +17,7 @@ const mapDispatchToProps = (dispatch) => {
const FloatingButtonContainer = connect(
mapStateToProps,
- mapDispatchToProps
+ mapDispatchToProps,
)(FloatingButton)
export default FloatingButtonContainer
diff --git a/app/containers/HeaderContainer.js b/app/containers/HeaderContainer.js
index 119ec22..68050b2 100644
--- a/app/containers/HeaderContainer.js
+++ b/app/containers/HeaderContainer.js
@@ -1,10 +1,10 @@
import { connect } from 'react-redux'
+import _ from 'lodash'
import { showComposerWithType, toggleIsCopied, toggleComposer } from '../actions/index'
import Header from '../components/header/Header'
-import _ from 'lodash'
const mapStateToProps = (state) => {
- const aliases = _.filter(state.keychainReducer.get('keychain').toJS(), key => {
+ const aliases = _.filter(state.keychainReducer.get('keychain').toJS(), (key) => {
return key.privateKeyArmored !== null
})
const first = aliases[0] || {
@@ -40,7 +40,7 @@ const mapDispatchToProps = (dispatch) => {
const HeaderContainer = connect(
mapStateToProps,
- mapDispatchToProps
+ mapDispatchToProps,
)(Header)
export default HeaderContainer
diff --git a/app/containers/KeychainContainer.js b/app/containers/KeychainContainer.js
index 43cd5e1..a2e857b 100644
--- a/app/containers/KeychainContainer.js
+++ b/app/containers/KeychainContainer.js
@@ -1,12 +1,12 @@
import { connect } from 'react-redux'
+import _ from 'lodash'
import { addKey, fetchKeychain, selectKey, showComposerWithType } from '../actions/index'
import Keychain from '../components/keychain/Keychain'
-import _ from 'lodash'
const mapStateToProps = (state) => {
return {
// For `KeychainList` component
- keychain: _.filter(state.keychainReducer.get('keychain').toJS(), key => {
+ keychain: _.filter(state.keychainReducer.get('keychain').toJS(), (key) => {
return key.privateKeyArmored === null
}),
selectedKeychain: state.uiReducer.get('selectedKeychain').toJS(),
@@ -40,7 +40,7 @@ const mapDispatchToProps = (dispatch) => {
const KeychainContainer = connect(
mapStateToProps,
- mapDispatchToProps
+ mapDispatchToProps,
)(Keychain)
export default KeychainContainer
diff --git a/app/containers/OutputContainer.js b/app/containers/OutputContainer.js
index f4ca592..6cd434f 100644
--- a/app/containers/OutputContainer.js
+++ b/app/containers/OutputContainer.js
@@ -4,7 +4,6 @@ import Output from '../components/output/Output'
const mapStateToProps = (state) => {
const output = state.uiReducer.get('output')
- console.log('output!!!!!!!', output)
let isShowingOutput = false
if (output.length> 1) {
isShowingOutput = true
@@ -35,7 +34,7 @@ const mapDispatchToProps = (dispatch) => {
const OutputContainer = connect(
mapStateToProps,
- mapDispatchToProps
+ mapDispatchToProps,
)(Output)
export default OutputContainer
diff --git a/app/index.js b/app/index.js
index 1dc2ffc..5acb0ca 100755
--- a/app/index.js
+++ b/app/index.js
@@ -14,5 +14,5 @@ render(
,
- document.getElementById('root')
+ document.getElementById('root'),
)
diff --git a/app/reducers/keychainReducer.js b/app/reducers/keychainReducer.js
index ad11310..5a01ef0 100644
--- a/app/reducers/keychainReducer.js
+++ b/app/reducers/keychainReducer.js
@@ -1,5 +1,5 @@
-import { ADD_KEY, SET_KEYCHAIN } from '../constants/KeychainConstants'
import { OrderedMap, Record } from 'immutable'
+import { ADD_KEY, SET_KEYCHAIN } from '../constants/KeychainConstants'
const KeyRecord = Record({
id: '',
@@ -27,11 +27,11 @@ const keychainReducer = (state = initialState, action) => {
publicKeyArmored: action.key.publicKeyArmored,
privateKeyArmored: action.key.privateKeyArmored || null,
avatar: action.key.avatar,
- })
+ }),
)
case SET_KEYCHAIN:
return state.withMutations((st) => {
- for (let key of action.keychain) {
+ for (const key of action.keychain) { // eslint-disable-line
st.setIn(
['keychain', key.id],
new KeyRecord({
@@ -41,7 +41,7 @@ const keychainReducer = (state = initialState, action) => {
publicKeyArmored: key.publicKeyArmored,
privateKeyArmored: key.privateKeyArmored || null,
avatar: key.avatar,
- })
+ }),
)
}
})
diff --git a/app/reducers/uiReducer.js b/app/reducers/uiReducer.js
index c816bae..0c05cb2 100644
--- a/app/reducers/uiReducer.js
+++ b/app/reducers/uiReducer.js
@@ -1,15 +1,7 @@
-import {
- TOGGLE_COMPOSER,
- TOGGLE_GENERATING_KEY,
- TOGGLE_IS_COPIED,
- SHOW_COMPOSER_WITH_TYPE,
- SELECT_KEY,
- CLEAR_SELECTED_KEYS,
- SET_ACTIVE_ALIAS,
- SET_OUTPUT,
-} from '../constants/UIConstants'
-
import { OrderedMap } from 'immutable'
+import { TOGGLE_COMPOSER, TOGGLE_GENERATING_KEY, TOGGLE_IS_COPIED,
+ SHOW_COMPOSER_WITH_TYPE, SELECT_KEY, CLEAR_SELECTED_KEYS,
+ SET_ACTIVE_ALIAS, SET_OUTPUT } from '../constants/UIConstants'
const initialState = OrderedMap({
isShowingComposer: false,
@@ -31,14 +23,13 @@ const uiReducer = (state = initialState, action) => {
return state.set('isCopied', !state.get('isCopied'))
case SHOW_COMPOSER_WITH_TYPE:
return state.set('composerType', action.data).set('isShowingComposer', true)
- case SELECT_KEY:
+ case SELECT_KEY: {
if (state.hasIn(['selectedKeychain', action.id])
&& state.getIn(['selectedKeychain', action.id]) === true) {
return state.setIn(['selectedKeychain', action.id], false)
- } else {
- return state.setIn(['selectedKeychain', action.id], true)
}
-
+ return state.setIn(['selectedKeychain', action.id], true)
+ }
case CLEAR_SELECTED_KEYS:
return state.setIn(['selectedKeychain'], OrderedMap({}))
@@ -46,7 +37,6 @@ const uiReducer = (state = initialState, action) => {
return state.set('activeAlias', action.activeAlias)
case SET_OUTPUT:
- console.log('seeeeeeting output!!!>>>>>>', action.output)
return state.set('output', action.output)
default:
diff --git a/app/utils/icons.js b/app/utils/icons.js
index 3b3c0ee..7824ea4 100644
--- a/app/utils/icons.js
+++ b/app/utils/icons.js
@@ -1,4 +1,4 @@
-'use strict' /* eslint max-len: 0 */
+/* eslint max-len: 0 */
const store = {
'more': `
`,
}
-export const getIcon = (name) => {
- return store.hasOwnProperty(name) ? store[name] : 'n/a'
+export const getIcon = (name) => { // eslint-disable-line import/prefer-default-export
+ return {}.hasOwnProperty.call(store, name) ? store[name] : 'n/a'
}
diff --git a/app/utils/pgp.js b/app/utils/pgp.js
index 347c0f4..c92e2cc 100644
--- a/app/utils/pgp.js
+++ b/app/utils/pgp.js
@@ -47,7 +47,7 @@ function getPrivateKeyPassphrase(privateKey) {
export async function generateKey({ name, email = '' }, passphrase) {
const key = await openpgp.generateKey({
userIds: [{ name, email }],
- numBits: 4096,
+ numBits: 4096,
passphrase,
})
diff --git a/main.development.js b/main.development.js
index 1596921..d843855 100755
--- a/main.development.js
+++ b/main.development.js
@@ -1,12 +1,13 @@
-import { app, BrowserWindow, Menu, shell, autoUpdater } from 'electron'
-const { version } = require('./package.json')
+import { app, BrowserWindow, Menu, shell, autoUpdater } from 'electron' // eslint-disable-line
import open from 'open'
+const { version } = require('./package.json')
+
let menu
let template
let mainWindow = null
-const feedUrl = `https://felony-app-update.herokuapp.com/update/${process.platform}_${process.arch}/${version}`
+const feedUrl = `https://felony-app-update.herokuapp.com/update/${ process.platform }_${ process.arch }/${ version }`
if (process.env.NODE_ENV !== 'development') {
autoUpdater.setFeedURL(feedUrl)
@@ -23,7 +24,6 @@ if (process.env.NODE_ENV !== 'development') {
autoUpdater.on('checking-for-update', () => {
check = false
- console.log('checking')
})
autoUpdater.on('update-available', () => {
@@ -39,7 +39,7 @@ if (process.env.NODE_ENV !== 'development') {
autoUpdater.quitAndInstall()
})
} catch (err) {
- console.log('error', err)
+ console.log('error', err) // eslint-disable-line no-console
}
}
@@ -146,7 +146,7 @@ const createWindow = () => {
label: 'Toggle Full Screen',
accelerator: 'Ctrl+Command+F',
click() {
- if (!!mainWindow) {
+ if (mainWindow) {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
},
@@ -160,7 +160,7 @@ const createWindow = () => {
label: 'Toggle Full Screen',
accelerator: 'Ctrl+Command+F',
click() {
- if (!!mainWindow) {
+ if (mainWindow) {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
},
@@ -233,7 +233,7 @@ const createWindow = () => {
label: 'Toggle &Full Screen',
accelerator: 'F11',
click() {
- if (!!mainWindow) {
+ if (mainWindow) {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
},
@@ -247,7 +247,7 @@ const createWindow = () => {
label: 'Toggle &Full Screen',
accelerator: 'F11',
click() {
- if (!!mainWindow) {
+ if (mainWindow) {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
},
@@ -282,7 +282,7 @@ const createWindow = () => {
}
if (process.env.NODE_ENV === 'development') {
- require('electron-debug')()
+ require('electron-debug')() // eslint-disable-line global-require
}
app.on('window-all-closed', () => {
diff --git a/package.js b/package.js
index 0272cab..c0c8b9a 100755
--- a/package.js
+++ b/package.js
@@ -1,26 +1,23 @@
-/* eslint strict: 0, no-shadow: 0, no-unused-vars: 0, no-console: 0 */
-'use strict'
-
-require('babel-polyfill')
-const os = require('os')
-const webpack = require('webpack')
-const electronCfg = require('./webpack.config.electron.js')
-const cfg = require('./webpack.config.production.js')
-const packager = require('electron-packager')
-const del = require('del')
-const exec = require('child_process').exec
+/* eslint-disable no-console */
+import 'babel-polyfill'
+import os from 'os'
+import webpack from 'webpack'
+import packager from 'electron-packager'
+import electronInstaller from 'electron-winstaller'
+import del from 'del'
+import { exec } from 'child_process'
+import electronCfg from './webpack.config.electron'
+import cfg from './webpack.config.production'
+import pkg from './package.json'
+
const argv = require('minimist')(process.argv.slice(2))
-const pkg = require('./package.json')
+
const deps = Object.keys(pkg.dependencies)
const devDeps = Object.keys(pkg.devDependencies)
-const electronInstaller = require('electron-winstaller');
-
const appName = argv.name || argv.n || pkg.productName
const shouldUseAsar = argv.asar || argv.a || false
const shouldBuildAll = argv.all || false
-console.log(electronCfg)
-
const DEFAULT_OPTS = {
dir: './',
name: appName,
@@ -33,7 +30,7 @@ const DEFAULT_OPTS = {
].concat(devDeps.map(name => `/node_modules/${ name }($|/)`))
.concat(
deps.filter(name => !electronCfg.default.externals.includes(name))
- .map(name => `/node_modules/${ name }($|/)`)
+ .map(name => `/node_modules/${ name }($|/)`),
),
}
@@ -76,14 +73,14 @@ function startPack() {
build(electronCfg.default)
.then(() => build(cfg.default))
.then(() => del('release'))
- .then(paths => {
+ .then(() => {
if (shouldBuildAll) {
// build for all platforms
const archs = ['ia32', 'x64']
const platforms = ['linux', 'win32', 'darwin']
- platforms.forEach(plat => {
- archs.forEach(arch => {
+ platforms.forEach((plat) => {
+ archs.forEach((arch) => {
pack(plat, arch, log(plat, arch))
})
})
@@ -92,7 +89,7 @@ function startPack() {
pack(os.platform(), os.arch(), log(os.platform(), os.arch()))
}
})
- .catch(err => {
+ .catch((err) => {
console.error(err)
})
}
@@ -134,17 +131,17 @@ function pack(plat, arch, cb) {
}
function log(plat, arch) {
- return (err, filepath) => {
+ return (err) => {
if (err) return console.error(err)
console.log(`${ plat }-${ arch } finished`)
if (`${ plat }-${ arch }` === 'win32-x64') {
- var resultPromise = electronInstaller.createWindowsInstaller({
+ const resultPromise = electronInstaller.createWindowsInstaller({
appDirectory: 'release/win32-x64/Felony-win32-x64',
outputDirectory: 'release/win32-x64-installer',
authors: 'Henry Boldizsar',
exe: 'Felony.exe',
- });
- resultPromise.then(() => console.log("It worked!"), (e) => console.log(`No dice: ${e.message}`));
+ })
+ resultPromise.then(() => console.log('It worked!'), e => console.log(`No dice: ${ e.message }`))
}
}
}
diff --git a/package.json b/package.json
index 42151aa..e1f5053 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
"devDependencies": {
"asar": "^0.11.0",
"babel-core": "^6.7.6",
- "babel-eslint": "^6.0.2",
+ "babel-eslint": "^6.1.2",
"babel-loader": "^6.2.4",
"babel-plugin-add-module-exports": "^0.1.2",
"babel-plugin-webpack-loaders": "^0.4.0",
@@ -71,10 +71,11 @@
"electron-prebuilt": "^1.2.6",
"electron-rebuild": "^1.1.3",
"electron-winstaller": "^2.3.1",
- "eslint": "^2.8.0",
- "eslint-config-airbnb": "^7.0.0",
- "eslint-plugin-jsx-a11y": "^0.6.2",
- "eslint-plugin-react": "^4.3.0",
+ "eslint": "^3.10.0",
+ "eslint-config-airbnb": "^13.0.0",
+ "eslint-plugin-import": "^2.2.0",
+ "eslint-plugin-jsx-a11y": "^2.2.3",
+ "eslint-plugin-react": "^6.6.0",
"express": "^4.13.4",
"extract-text-webpack-plugin": "^1.0.1",
"fbjs-scripts": "^0.6.0",
diff --git a/server.js b/server.js
index 585f4e5..dcb4e77 100755
--- a/server.js
+++ b/server.js
@@ -1,5 +1,4 @@
-/* eslint no-console: 0 */
-
+/* eslint-disable no-console */
import express from 'express'
import webpack from 'webpack'
import webpackDevMiddleware from 'webpack-dev-middleware'
@@ -20,7 +19,7 @@ app.use(webpackDevMiddleware(compiler, {
app.use(webpackHotMiddleware(compiler))
-app.listen(PORT, 'localhost', err => {
+app.listen(PORT, 'localhost', (err) => {
if (err) {
console.error(err)
return