Skip to content

Commit

Permalink
installed eslint & extends from airbnb
Browse files Browse the repository at this point in the history
  • Loading branch information
bekatom committed Sep 30, 2016
1 parent 5812453 commit 8373d3b
Show file tree
Hide file tree
Showing 10 changed files with 120 additions and 361 deletions.
13 changes: 13 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"extends": "airbnb",
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true
}
},
"rules": {
"max-len": ["warn", 120],
"indent": ["warn", 4],
"react/jsx-indent": ["warn", 4]
}
}
263 changes: 0 additions & 263 deletions .eslintrc.json

This file was deleted.

9 changes: 9 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"compilerOptions": {
"target": "ES6",
"allowSyntheticDefaultImports": true
},
"exclude": [
"node_modules"
]
}
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
"chai": "^3.5.0",
"chai-jquery": "^2.0.0",
"css-loader": "^0.23.1",
"eslint": "^3.4.0",
"eslint-config-standard": "^6.0.0",
"eslint-plugin-promise": "^2.0.1",
"eslint-plugin-react": "^6.2.0",
"eslint-plugin-standard": "^2.0.0",
"eslint": "^3.6.1",
"eslint-config-airbnb": "^12.0.0",
"eslint-plugin-import": "^1.16.0",
"eslint-plugin-jsx-a11y": "^2.2.2",
"eslint-plugin-react": "^6.3.0",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
"html-webpack-plugin": "^2.21.0",
Expand All @@ -61,6 +61,8 @@
},
"dependencies": {
"bootstrap-social": "^5.0.0",
"eslint-config-airbnb": "^12.0.0",
"eslint-plugin-import": "^2.0.0",
"express": "^4.14.0",
"firebase": "^3.0.5",
"font-awesome": "^4.6.3",
Expand Down
12 changes: 6 additions & 6 deletions src/app/components/app.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {Component} from 'react';
import {Link} from 'react-router';
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {fetchUser, logoutUser} from '../actions/firebase_actions';
import React, { Component } from 'react';
import { Link } from 'react-router';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { fetchUser, logoutUser } from '../actions/firebase_actions';

class App extends Component {

Expand Down Expand Up @@ -64,7 +64,7 @@ class App extends Component {
,
</ul>
<ul className="nav navbar-nav navbar-right">
{this.renderUserMenu(this.props.currentUser)}
{ this.renderUserMenu(this.props.currentUser) }
</ul>
</nav>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/helpers/loading.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react'
import React from 'react';


const Loading = () => {
return (
return (
<div className="col-md-4">
Loading ....
</div>
)
);
};

export default Loading
export default Loading;
Loading

0 comments on commit 8373d3b

Please sign in to comment.