Skip to content

Commit 16276ee

Browse files
committed
Prettier
1 parent bdb83c0 commit 16276ee

File tree

16 files changed

+440
-44
lines changed

16 files changed

+440
-44
lines changed

Diff for: .prettierrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"trailingComma": "es5",
3+
"semi": true,
4+
"singleQuote": true
5+
}

Diff for: package.json

+21-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
"react-router-dom": "^5.0.1",
1111
"react-scripts": "3.0.1"
1212
},
13+
"devDependencies": {
14+
"husky": ">=1",
15+
"lint-staged": ">=8",
16+
"prettier": "1.17.1"
17+
},
1318
"scripts": {
1419
"start": "react-scripts start",
1520
"build": "react-scripts build",
16-
"test": "react-scripts test",
17-
"eject": "react-scripts eject"
21+
"test": "react-scripts test"
1822
},
1923
"eslintConfig": {
2024
"extends": "react-app"
@@ -30,5 +34,20 @@
3034
"last 1 firefox version",
3135
"last 1 safari version"
3236
]
37+
},
38+
"husky": {
39+
"hooks": {
40+
"pre-commit": "lint-staged"
41+
}
42+
},
43+
"lint-staged": {
44+
"*.{js,css,json,md}": [
45+
"prettier --write",
46+
"git add"
47+
],
48+
"*.js": [
49+
"eslint --fix",
50+
"git add"
51+
]
3352
}
3453
}

Diff for: src/App.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import React from "react";
1+
import React from 'react';
22

3-
import AppContainer from "./AppContainer";
3+
import AppContainer from './AppContainer';
44

55
export default function Application() {
6-
return (
7-
<AppContainer />
8-
);
6+
return <AppContainer />;
97
}

Diff for: src/AppContainer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React from "react";
2-
import { BrowserRouter as Router, Route } from "react-router-dom";
1+
import React from 'react';
2+
import { BrowserRouter as Router, Route } from 'react-router-dom';
33

44
import { HomeScreen, TriviaScreen, TriviaResultScreen } from './components';
55

Diff for: src/components/HomeScreen/HomeScreen.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import React from "react";
2-
import Button from "@material-ui/core/Button";
3-
import { Link } from "react-router-dom";
1+
import React from 'react';
2+
import Button from '@material-ui/core/Button';
3+
import { Link } from 'react-router-dom';
44

5-
import Page from "../Page";
6-
import { TitleLogo } from "./components";
7-
import Styles from "./HomeScreen.module.css";
5+
import Page from '../Page';
6+
import { TitleLogo } from './components';
7+
import Styles from './HomeScreen.module.css';
88

99
export default function HomeScreen({ navigation }) {
1010
return (

Diff for: src/components/HomeScreen/components/TitleLogo/TitleLogo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from "react";
1+
import React from 'react';
22

33
import Styles from './TitleLogo.module.css';
44

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import TitleLogo from "./TitleLogo";
1+
import TitleLogo from './TitleLogo';
22

33
export default TitleLogo;

Diff for: src/components/HomeScreen/components/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import TitleLogo from "./TitleLogo";
1+
import TitleLogo from './TitleLogo';
22

33
export { TitleLogo };

Diff for: src/components/HomeScreen/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import HomeScreen from "./HomeScreen";
1+
import HomeScreen from './HomeScreen';
22

33
export default HomeScreen;

Diff for: src/components/Page/Page.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Container from "@material-ui/core/Container";
2+
import Container from '@material-ui/core/Container';
33

44
import Styles from './Page.module.css';
55

@@ -11,4 +11,4 @@ export default function Page({ children, ...props }) {
1111
</div>
1212
</Container>
1313
);
14-
}
14+
}

Diff for: src/components/TriviaResultScreen/App.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React from "react";
2-
import Button from "@material-ui/core/Button";
1+
import React from 'react';
2+
import Button from '@material-ui/core/Button';
33

4-
import "./App.css";
4+
import './App.css';
55

66
function App() {
77
return (
@@ -18,7 +18,7 @@ function App() {
1818
variant="contained"
1919
color="primary"
2020
>
21-
Learn React
21+
Learn React
2222
</Button>
2323
</header>
2424
</div>

Diff for: src/components/TriviaResultScreen/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import App from "./App";
1+
import App from './App';
22

33
export default App;

Diff for: src/components/TriviaScreen/App.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React from "react";
2-
import Button from "@material-ui/core/Button";
1+
import React from 'react';
2+
import Button from '@material-ui/core/Button';
33

4-
import "./App.css";
4+
import './App.css';
55

66
function App() {
77
return (
@@ -18,7 +18,7 @@ function App() {
1818
variant="contained"
1919
color="primary"
2020
>
21-
Learn React
21+
Learn React
2222
</Button>
2323
</header>
2424
</div>

Diff for: src/components/TriviaScreen/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import App from "./App";
1+
import App from './App';
22

33
export default App;

Diff for: src/components/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import HomeScreen from "./HomeScreen";
2-
import TriviaScreen from "./TriviaScreen";
3-
import TriviaResultScreen from "./TriviaResultScreen";
1+
import HomeScreen from './HomeScreen';
2+
import TriviaScreen from './TriviaScreen';
3+
import TriviaResultScreen from './TriviaResultScreen';
44

55
export { HomeScreen, TriviaScreen, TriviaResultScreen };

0 commit comments

Comments
 (0)