Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9aa8062

Browse files
ESLint & Prettier - configuration (#24)
* Install ESLint with callstack/eslint-config The ESLint setup extends the "@callstack" configuration done for React Native environment. * Fix: Linter errors Due to applying new code style all errors found by Linter had to be fixed. To avoid color literals, the shared Colors array has been created for common colors source. * Add ESLint as a pre-commit hook * Install explicitly prettier * Add code verification to the CI workflow * Fix: ESLint errors in CI The errors in the CI workflow were left intentionally so it's double checked that verification is OK on the CI. --no-verify was launched when running previous commit. * Turn off linebreak-style rule * CRLF to LF fix * Turn off auto CRLF for Windows executor in CI workflow * Fix: empty new line in Colors.js
1 parent 6d7f3bc commit 9aa8062

File tree

12 files changed

+1369
-493
lines changed

12 files changed

+1369
-493
lines changed

‎.circleci/config.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
name: windows/default
1010
shell: powershell.exe
1111
steps:
12+
- run: git config --global core.autocrlf false
1213
- checkout
1314
- run:
1415
name: "Display environment information"
@@ -28,6 +29,21 @@ jobs:
2829
- node_modules
2930
- windows/packages
3031

32+
verify:
33+
executor:
34+
name: windows/default
35+
shell: powershell.exe
36+
steps:
37+
- run: git config --global core.autocrlf false
38+
- checkout
39+
- restore_cache:
40+
keys:
41+
- v1-deps-{{ .Branch }}-{{ checksum "windows/ReactNativeNotes.sln" }}
42+
- v1-deps-
43+
- run:
44+
name: "Verify the standards and code quality"
45+
command: npx eslint ./src/**
46+
3147
# Application build
3248
build-Application-Configuration-Platform:
3349
parameters:
@@ -39,6 +55,7 @@ jobs:
3955
enum: ["ARM64", "x64", "ARM", "Win32"]
4056
executor: windows/default
4157
steps:
58+
- run: git config --global core.autocrlf false
4259
- checkout
4360
- restore_cache:
4461
keys:
@@ -54,6 +71,9 @@ workflows:
5471
build-x64:
5572
jobs:
5673
- install
74+
- verify:
75+
requires:
76+
- install
5777
- build-Application-Configuration-Platform:
5878
name: build-Application-Release-x64
5979
configuration: "release"

‎.eslintrc.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
module.exports = {
22
root: true,
3-
extends: '@react-native-community',
3+
extends: "@callstack",
4+
rules: {
5+
"linebreak-style": 0
6+
}
47
};

‎index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/**
22
* @format
33
*/
4-
54
import {AppRegistry} from 'react-native';
65

76
import NotesMainPanel from './src/NotesMainPanel';

‎package.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,28 @@
1111
"dependencies": {
1212
"@react-native-community/checkbox": "^0.5.7",
1313
"@react-native-community/datetimepicker": "^3.4.7",
14+
"husky": "^7.0.0",
1415
"react": "16.13.1",
1516
"react-native": "^0.64.0",
1617
"react-native-windows": "0.64.4"
1718
},
1819
"devDependencies": {
1920
"@babel/core": "^7.8.4",
2021
"@babel/runtime": "^7.8.4",
22+
"@callstack/eslint-config": "^11.0.0",
2123
"@react-native-community/eslint-config": "^1.1.0",
2224
"babel-jest": "^25.1.0",
23-
"eslint": "^6.5.1",
25+
"eslint": "^7.29.0",
2426
"jest": "^25.1.0",
2527
"metro-react-native-babel-preset": "^0.59.0",
28+
"prettier": "2.3.2",
2629
"react-test-renderer": "16.13.1"
2730
},
31+
"husky": {
32+
"hooks": {
33+
"pre-commit": "npx eslint ./src/**"
34+
}
35+
},
2836
"jest": {
2937
"preset": "react-native"
3038
}

‎src/CreateNotePanel.js‎

Lines changed: 63 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* @format
33
* @flow strict-local
44
*/
5-
65
import React from 'react';
76
import {
87
Alert,
@@ -13,17 +12,16 @@ import {
1312
View,
1413
Button,
1514
} from 'react-native';
16-
17-
15+
import Colors from './Resources/Colors';
1816

1917
class CreateNotePanel extends React.Component {
2018
constructor(props) {
2119
super(props);
2220
this.state = {
23-
title: "",
24-
message: "",
25-
}
26-
};
21+
title: '',
22+
message: '',
23+
};
24+
}
2725

2826
titleOnChange = (text) => {
2927
this.setState({title: text});
@@ -34,98 +32,99 @@ class CreateNotePanel extends React.Component {
3432
};
3533

3634
cancelButtonPressed = () => {
37-
if(this.state.title !== "" || this.state.message !== "") {
38-
Alert.alert("Are you sure?", "It looks like you still have unsaved changes, which are going to be lost.",
39-
[
40-
{
41-
text: "Cancel",
42-
style: "cancel"
43-
},
44-
{
45-
text: "Discard",
46-
onPress: () => NativeModules.NoteWidgetClickHandler.goToNotesScreen()
47-
}
48-
])
49-
}
50-
else {
35+
if (this.state.title !== '' || this.state.message !== '') {
36+
Alert.alert(
37+
'Are you sure?',
38+
'It looks like you still have unsaved changes, which are going to be lost.',
39+
[
40+
{
41+
text: 'Cancel',
42+
style: 'cancel',
43+
},
44+
{
45+
text: 'Discard',
46+
onPress: () =>
47+
NativeModules.NoteWidgetClickHandler.goToNotesScreen(),
48+
},
49+
],
50+
);
51+
} else {
5152
NativeModules.NoteWidgetClickHandler.goToNotesScreen();
5253
}
5354
};
5455

5556
createButtonPressed = () => {
56-
NativeModules.Database.writeNote(this.state.title, false, this.state.message);
57+
NativeModules.Database.writeNote(
58+
this.state.title,
59+
false,
60+
this.state.message,
61+
);
5762
NativeModules.NoteWidgetClickHandler.goToNotesScreen();
58-
}
59-
63+
};
6064

6165
render() {
6266
return (
6367
<View style={styles.mainPanel}>
64-
65-
<TextInput style={styles.titleBox}
66-
onChangeText={this.titleOnChange}
67-
value={this.state.title}
68-
autoFocus={true}
69-
clearButtonMode={"while-editing"}
70-
placeholder={"Title"}
71-
/>
72-
73-
<TextInput style={styles.noteMessageBox}
74-
multiline={true}
75-
onChangeText={this.messageOnChange}
76-
value={this.state.message}
77-
placeholder={"Note content"}
78-
/>
68+
<TextInput
69+
style={styles.titleBox}
70+
onChangeText={this.titleOnChange}
71+
value={this.state.title}
72+
autoFocus={true}
73+
clearButtonMode={'while-editing'}
74+
placeholder={'Title'}
75+
/>
76+
77+
<TextInput
78+
style={styles.noteMessageBox}
79+
multiline={true}
80+
onChangeText={this.messageOnChange}
81+
value={this.state.message}
82+
placeholder={'Note content'}
83+
/>
7984

8085
<View style={styles.actionsPanel}>
81-
<Button title={"Discard"} onPress={this.cancelButtonPressed}/>
82-
<Button title={"Create!"} onPress={this.createButtonPressed}/>
86+
<Button title={'Discard'} onPress={this.cancelButtonPressed}/>
87+
<Button title={'Create!'} onPress={this.createButtonPressed}/>
8388
</View>
84-
8589
</View>
8690
);
8791
}
88-
};
89-
92+
}
9093

9194
const styles = StyleSheet.create({
9295
mainPanel: {
9396
flex: 1,
94-
flexDirection: "column",
95-
alignItems: "center",
96-
margin: 30
97-
},
98-
titlePanel: {
99-
height: 60,
97+
flexDirection: 'column',
98+
alignItems: 'center',
99+
margin: 30,
100100
},
101101
titleBox: {
102102
borderLeftWidth: 0,
103103
borderRightWidth: 0,
104104
borderBottomWidth: 1,
105105
borderTopWidth: 0,
106-
width: "90%",
107-
borderColor: "#D0D0D0",
108-
fontWeight: "bold"
106+
width: '90%',
107+
borderColor: Colors.noteTextPanelBorder,
108+
fontWeight: 'bold',
109109
},
110110
noteMessageBox: {
111111
borderWidth: 0.2,
112112
margin: 10,
113-
width: "90%",
114-
height: "85%",
115-
borderColor: "#D0D0D0",
116-
alignContent: "center",
117-
textAlignVertical: "center",
113+
width: '90%',
114+
height: '85%',
115+
borderColor: Colors.noteTextPanelBorder,
116+
alignContent: 'center',
117+
textAlignVertical: 'center',
118118
},
119119
actionsPanel: {
120120
flex: 1,
121-
flexDirection: "row",
122-
justifyContent: "space-around",
123-
width: "60%",
121+
flexDirection: 'row',
122+
justifyContent: 'space-around',
123+
width: '60%',
124124
maxHeight: 35,
125-
}
125+
},
126126
});
127127

128-
129-
AppRegistry.registerComponent("CreateNotePanel", () => CreateNotePanel);
128+
AppRegistry.registerComponent('CreateNotePanel', () => CreateNotePanel);
130129

131130
export default CreateNotePanel;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /