summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnike Arni <aarni@thoughtworks.com>2017-02-08 11:11:38 -0200
committerAnike Arni <aarni@thoughtworks.com>2017-02-08 13:51:37 -0200
commit94fc7554995e4b6fcd95e74d082ed411239ea8e9 (patch)
tree88810c4a44b6c097510b9e29e92b947f07ef9606
parent16190197f72ea242ae239dc2741e2887c7008dfa (diff)
[#922] Add semincolon to lint and fix js code
with @tayanefernandes
-rw-r--r--web-ui/.eslintrc.json4
-rw-r--r--web-ui/src/account_recovery/account_recovery.js18
-rw-r--r--web-ui/src/account_recovery/page.js16
-rw-r--r--web-ui/src/common/input_field/input_field.js10
-rw-r--r--web-ui/src/common/submit_button/submit_button.js10
-rw-r--r--web-ui/src/i18n.js20
-rw-r--r--web-ui/test/unit/account_recovery/page.spec.js32
-rw-r--r--web-ui/test/unit/common/input_field/input_field.spec.js24
-rw-r--r--web-ui/test/unit/common/submit_button/submit_button.spec.js20
9 files changed, 77 insertions, 77 deletions
diff --git a/web-ui/.eslintrc.json b/web-ui/.eslintrc.json
index 4828136e..554498f9 100644
--- a/web-ui/.eslintrc.json
+++ b/web-ui/.eslintrc.json
@@ -1,3 +1,4 @@
+/* see https://github.com/airbnb/javascript for lint rules */
{
"extends": "airbnb",
"plugins": [
@@ -12,7 +13,6 @@
"react/jsx-filename-extension": ["off"],
"jsx-quotes": ["error", "prefer-single"],
"no-undef": ["off"],
- "comma-dangle": ["off"],
- "semi": ["error", "never"]
+ "comma-dangle": ["off"]
}
}
diff --git a/web-ui/src/account_recovery/account_recovery.js b/web-ui/src/account_recovery/account_recovery.js
index eac14bf7..d4e0f4e8 100644
--- a/web-ui/src/account_recovery/account_recovery.js
+++ b/web-ui/src/account_recovery/account_recovery.js
@@ -15,21 +15,21 @@
* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
*/
-import React from 'react'
-import { render } from 'react-dom'
-import a11y from 'react-a11y'
-import { I18nextProvider } from 'react-i18next'
+import React from 'react';
+import { render } from 'react-dom';
+import a11y from 'react-a11y';
+import { I18nextProvider } from 'react-i18next';
-import 'font-awesome/scss/font-awesome.scss'
+import 'font-awesome/scss/font-awesome.scss';
-import PageWrapper from './page'
-import i18n from '../i18n'
+import PageWrapper from './page';
+import i18n from '../i18n';
-if (process.env.NODE_ENV === 'development') a11y(React)
+if (process.env.NODE_ENV === 'development') a11y(React);
render(
<I18nextProvider i18n={i18n}>
<PageWrapper />
</I18nextProvider>,
document.getElementById('root')
-)
+);
diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js
index 396788e7..ac01529d 100644
--- a/web-ui/src/account_recovery/page.js
+++ b/web-ui/src/account_recovery/page.js
@@ -15,12 +15,12 @@
* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
*/
-import React from 'react'
-import { translate } from 'react-i18next'
-import SubmitButton from 'src/common/submit_button/submit_button'
-import InputField from 'src/common/input_field/input_field'
+import React from 'react';
+import { translate } from 'react-i18next';
+import SubmitButton from 'src/common/submit_button/submit_button';
+import InputField from 'src/common/input_field/input_field';
-import './page.scss'
+import './page.scss';
export const Page = ({ t }) => (
<div className='container'>
@@ -39,10 +39,10 @@ export const Page = ({ t }) => (
</div>
</form>
</div>
-)
+);
Page.propTypes = {
t: React.PropTypes.func.isRequired
-}
+};
-export default translate('', { wait: true })(Page)
+export default translate('', { wait: true })(Page);
diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index 70d18618..1378ba74 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -15,20 +15,20 @@
* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
*/
-import React from 'react'
+import React from 'react';
-import './input-field.scss'
+import './input-field.scss';
const InputField = ({ label, name }) => (
<div className='input-field-group'>
<input type='text' name={name} className='input-field' required />
<label className='input-field-label' htmlFor={name}>{label}</label>
</div>
-)
+);
InputField.propTypes = {
label: React.PropTypes.string.isRequired,
name: React.PropTypes.string.isRequired
-}
+};
-export default InputField
+export default InputField;
diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index ea1bbf26..fb87bf7d 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -15,16 +15,16 @@
* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
*/
-import React from 'react'
+import React from 'react';
-import './submit-button.scss'
+import './submit-button.scss';
const SubmitButton = ({ buttonText }) => (
<input type='submit' className='submit-button' value={buttonText} />
-)
+);
SubmitButton.propTypes = {
buttonText: React.PropTypes.string.isRequired
-}
+};
-export default SubmitButton
+export default SubmitButton;
diff --git a/web-ui/src/i18n.js b/web-ui/src/i18n.js
index b68f17ae..bbbe2dcd 100644
--- a/web-ui/src/i18n.js
+++ b/web-ui/src/i18n.js
@@ -14,17 +14,17 @@
* You should have received a copy of the GNU Affero General Public License
* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
*/
-import i18n from 'i18next'
-import i18nBackend from 'i18nextXHRBackend'
-import I18nDetector from 'i18nextBrowserLanguageDetector'
+import i18n from 'i18next';
+import i18nBackend from 'i18nextXHRBackend';
+import I18nDetector from 'i18nextBrowserLanguageDetector';
-const detector = new I18nDetector()
-const detect = detector.detect.bind(detector)
+const detector = new I18nDetector();
+const detect = detector.detect.bind(detector);
detector.detect = (detectionOrder) => {
- const result = detect(detectionOrder)
- return result.replace('-', '_')
-}
+ const result = detect(detectionOrder);
+ return result.replace('-', '_');
+};
i18n
.use(i18nBackend)
@@ -34,6 +34,6 @@ i18n
backend: {
loadPath: 'assets/locales/{{lng}}/{{ns}}.json'
}
- })
+ });
-export default i18n
+export default i18n;
diff --git a/web-ui/test/unit/account_recovery/page.spec.js b/web-ui/test/unit/account_recovery/page.spec.js
index ec9fb844..6a139167 100644
--- a/web-ui/test/unit/account_recovery/page.spec.js
+++ b/web-ui/test/unit/account_recovery/page.spec.js
@@ -1,26 +1,26 @@
-import { shallow } from 'enzyme'
-import expect from 'expect'
-import React from 'react'
-import { Page } from 'src/account_recovery/page'
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { Page } from 'src/account_recovery/page';
describe('Page', () => {
- let mockT
- let page
+ let mockT;
+ let page;
beforeEach(() => {
- mockT = key => key
- page = shallow(<Page t={mockT} />)
- })
+ mockT = key => key;
+ page = shallow(<Page t={mockT} />);
+ });
it('renders backup email page title', () => {
- expect(page.find('h1').text()).toEqual('backup-account.title')
- })
+ expect(page.find('h1').text()).toEqual('backup-account.title');
+ });
it('renders backup account email input field', () => {
- expect(page.find('InputField').props().name).toEqual('email')
- })
+ expect(page.find('InputField').props().name).toEqual('email');
+ });
it('renders backup account submit button', () => {
- expect(page.find('SubmitButton').props().buttonText).toEqual('backup-account.button')
- })
-})
+ expect(page.find('SubmitButton').props().buttonText).toEqual('backup-account.button');
+ });
+});
diff --git a/web-ui/test/unit/common/input_field/input_field.spec.js b/web-ui/test/unit/common/input_field/input_field.spec.js
index 88983f4f..0c044ce1 100644
--- a/web-ui/test/unit/common/input_field/input_field.spec.js
+++ b/web-ui/test/unit/common/input_field/input_field.spec.js
@@ -1,20 +1,20 @@
-import { shallow } from 'enzyme'
-import expect from 'expect'
-import React from 'react'
-import InputField from 'src/common/input_field/input_field'
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import InputField from 'src/common/input_field/input_field';
describe('InputField', () => {
- let inputField
+ let inputField;
beforeEach(() => {
- inputField = shallow(<InputField label="Email" name="email" />)
- })
+ inputField = shallow(<InputField label='Email' name='email' />);
+ });
it('renders an input of type text for email', () => {
- expect(inputField.find('input[type="text"]').props().name).toEqual('email')
- })
+ expect(inputField.find('input[type="text"]').props().name).toEqual('email');
+ });
it('renders a label for the email', () => {
- expect(inputField.find('label').text()).toEqual('Email')
- })
-})
+ expect(inputField.find('label').text()).toEqual('Email');
+ });
+});
diff --git a/web-ui/test/unit/common/submit_button/submit_button.spec.js b/web-ui/test/unit/common/submit_button/submit_button.spec.js
index 629b3545..8279547c 100644
--- a/web-ui/test/unit/common/submit_button/submit_button.spec.js
+++ b/web-ui/test/unit/common/submit_button/submit_button.spec.js
@@ -1,16 +1,16 @@
-import { shallow } from 'enzyme'
-import expect from 'expect'
-import React from 'react'
-import SubmitButton from 'src/common/submit_button/submit_button'
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import SubmitButton from 'src/common/submit_button/submit_button';
describe('SubmitButton', () => {
- let submitButton
+ let submitButton;
beforeEach(() => {
- submitButton = shallow(<SubmitButton buttonText="Add Email" />)
- })
+ submitButton = shallow(<SubmitButton buttonText='Add Email' />);
+ });
it('renders an input of type submit for add email', () => {
- expect(submitButton.find('input[type="submit"]').props().value).toEqual('Add Email')
- })
-})
+ expect(submitButton.find('input[type="submit"]').props().value).toEqual('Add Email');
+ });
+});