Skip to content
This repository was archived by the owner on Mar 4, 2022. It is now read-only.

Commit 2ba7530

Browse files
ashwinGokhaleashwinGokhale
committed
Added prettier to eslint
1 parent 4a2549b commit 2ba7530

File tree

21 files changed

+136
-108
lines changed

21 files changed

+136
-108
lines changed

‎.eslintrc

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎app.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ runtime: nodejs8
44
env_variables:
55
NODE_ENV: 'production'
66

7-
instance_class: F2
7+
instance_class: F1
88
automatic_scaling:
99
max_instances: 1

‎frontend/.eslintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"root": true,
33
"parser": "babel-eslint",
4-
"extends": "airbnb",
5-
"plugins": ["import", "prettier", "react"],
4+
"extends": ["airbnb", "prettier", "prettier/react"],
5+
"plugins": ["import", "prettier", "react", "unicorn"],
66
"rules": {
77
"indent": "off",
88
"no-tabs": "off",

‎frontend/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
"babel-runtime": "^6.26.0",
1010
"eslint": "^4.19.1",
1111
"eslint-config-airbnb": "16.1.0",
12+
"eslint-config-prettier": "^3.1.0",
1213
"eslint-plugin-import": "^2.7.0",
1314
"eslint-plugin-jsx-a11y": "^6.0.2",
1415
"eslint-plugin-prettier": "^2.6.0",
1516
"eslint-plugin-react": "^7.7.0",
17+
"eslint-plugin-unicorn": "^6.0.1",
1618
"prettier": "^1.12.1",
1719
"prettier-eslint": "^8.8.1"
1820
},
@@ -36,14 +38,14 @@
3638
"react-router": "^4.2.0",
3739
"react-router-dom": "^4.2.2",
3840
"react-router-redux": "^5.0.0-alpha.9",
41+
"react-scripts": "^1.1.4",
3942
"recompose": "^0.28.2",
4043
"redux": "^3.7.2",
4144
"redux-devtools-extension": "^2.13.2",
4245
"redux-logger": "^3.0.6",
4346
"redux-thunk": "^2.2.0",
4447
"sanitize.css": "^5.0.0",
45-
"validator": "^10.1.0",
46-
"react-scripts": "^1.1.4"
48+
"validator": "^10.1.0"
4749
},
4850
"scripts": {
4951
"start": "react-scripts start",

‎frontend/src/components/Common/CustomRedirect.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@ class CustomRedirect extends Component {
3131
render = () => <Redirect to={this.props.to} />;
3232
}
3333

34-
export default connect(null, { flash: sendFlashMessage })(CustomRedirect);
34+
export default connect(
35+
null,
36+
{ flash: sendFlashMessage }
37+
)(CustomRedirect);

‎frontend/src/components/Common/MembersMap.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ export default compose(
1717
)(props => (
1818
<GoogleMap defaultZoom={3} defaultCenter={{ lat: 40.4237, lng: -86.9212 }}>
1919
<MarkerClusterer onClick={props.onMarkerClustererClick} enableRetinaIcons>
20-
{props.markers.map((marker, i) => <MarkerInfo key={`marker:${i}`} marker={marker} />)}
20+
{props.markers.map((marker, i) => (
21+
<MarkerInfo key={`marker:${i}`} marker={marker} />
22+
))}
2123
</MarkerClusterer>
2224
</GoogleMap>
2325
));

‎frontend/src/components/Credentials/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ class CredentialsPage extends Component {
196196
}
197197
}
198198

199-
export default connect(null, { flash: sendFlashMessage, clear: clearFlashMessages })(
200-
CredentialsPage
201-
);
199+
export default connect(
200+
null,
201+
{ flash: sendFlashMessage, clear: clearFlashMessages }
202+
)(CredentialsPage);

‎frontend/src/components/EventCheckin/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ const mapStateToProps = state => ({
335335
...state.sessionState
336336
});
337337

338-
export default connect(mapStateToProps, { flash: sendFlashMessage, clear: clearFlashMessages })(
339-
EventCheckinPage
340-
);
338+
export default connect(
339+
mapStateToProps,
340+
{ flash: sendFlashMessage, clear: clearFlashMessages }
341+
)(EventCheckinPage);

‎frontend/src/components/ForgotPassword/index.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ class ForgotPasswordPage extends Component {
7676

7777
const mapStateToProps = state => ({ ...state.sessionState });
7878

79-
export default connect(mapStateToProps, {
80-
flash: sendFlashMessage,
81-
clear: clearFlashMessages
82-
})(ForgotPasswordPage);
79+
export default connect(
80+
mapStateToProps,
81+
{
82+
flash: sendFlashMessage,
83+
clear: clearFlashMessages
84+
}
85+
)(ForgotPasswordPage);

‎frontend/src/components/Location/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ const mapStateToProps = state => ({
186186
...state.sessionState
187187
});
188188

189-
export default connect(mapStateToProps, { flash: sendFlashMessage, clear: clearFlashMessages })(
190-
LocationPage
191-
);
189+
export default connect(
190+
mapStateToProps,
191+
{ flash: sendFlashMessage, clear: clearFlashMessages }
192+
)(LocationPage);

‎frontend/src/components/Locations/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const mapStateToProps = state => ({
8181
...state.sessionState
8282
});
8383

84-
export default connect(mapStateToProps, { flash: sendFlashMessage, clear: clearFlashMessages })(
85-
LocationsPage
86-
);
84+
export default connect(
85+
mapStateToProps,
86+
{ flash: sendFlashMessage, clear: clearFlashMessages }
87+
)(LocationsPage);

‎frontend/src/components/LocationsMap/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const mapStateToProps = state => ({
5555
...state.sessionState
5656
});
5757

58-
export default connect(mapStateToProps, { flash: sendFlashMessage, clear: clearFlashMessages })(
59-
LocationsMapPage
60-
);
58+
export default connect(
59+
mapStateToProps,
60+
{ flash: sendFlashMessage, clear: clearFlashMessages }
61+
)(LocationsMapPage);

‎frontend/src/components/Logout/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ class Logout extends Component {
1818
render = () => <Redirect to={routes.HOME} />;
1919
}
2020

21-
export default connect(null, { signOut, sendFlashMessage })(Logout);
21+
export default connect(
22+
null,
23+
{ signOut, sendFlashMessage }
24+
)(Logout);

‎frontend/src/components/Members/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,7 @@ const mapStateToProps = state => ({
8686
...state.sessionState
8787
});
8888

89-
export default connect(mapStateToProps, {})(MembersPage);
89+
export default connect(
90+
mapStateToProps,
91+
{}
92+
)(MembersPage);

‎frontend/src/components/OLD-Signup/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,7 @@ const mapStateToProps = state => ({
156156
...state.sessionState
157157
});
158158

159-
export default connect(mapStateToProps, { signUp, flash: sendFlashMessage })(SignupPage);
159+
export default connect(
160+
mapStateToProps,
161+
{ signUp, flash: sendFlashMessage }
162+
)(SignupPage);

‎frontend/src/components/Permission/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ const mapStateToProps = state => ({
222222
...state.sessionState
223223
});
224224

225-
export default connect(mapStateToProps, { flash: sendFlashMessage, clear: clearFlashMessages })(
226-
PermissionPage
227-
);
225+
export default connect(
226+
mapStateToProps,
227+
{ flash: sendFlashMessage, clear: clearFlashMessages }
228+
)(PermissionPage);

‎frontend/src/components/ResetPassword/index.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ class ResetPasswordPage extends Component {
104104

105105
const mapStateToProps = state => ({ ...state.sessionState });
106106

107-
export default connect(mapStateToProps, {
108-
flash: sendFlashMessage,
109-
clear: clearFlashMessages
110-
})(ResetPasswordPage);
107+
export default connect(
108+
mapStateToProps,
109+
{
110+
flash: sendFlashMessage,
111+
clear: clearFlashMessages
112+
}
113+
)(ResetPasswordPage);

‎frontend/src/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import App from './components/App';
77
import 'sanitize.css/sanitize.css';
88
import './index.css';
99

10-
1110
if (process.env.NODE_ENV !== 'development') {
1211
console.log = () => {};
1312
console.warn = () => {};

‎frontend/src/stories/index.js

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)