Skip to content

Commit db4c7ac

Browse files
boyangwangboyangwang
committed
pretty
1 parent 76352f9 commit db4c7ac

39 files changed

+259
-916
lines changed

‎diary-front/package.json‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,42 +91,23 @@
9191
"jest": {
9292
"collectCoverageFrom": ["src/**/*.{js,jsx,ts,tsx}"],
9393
"setupFiles": ["<rootDir>/config/polyfills.js"],
94-
"testMatch": [
95-
"<rootDir>/src/**/__tests__/**/*.(j|t)s?(x)",
96-
"<rootDir>/src/**/?(*.)(spec|test).(j|t)s?(x)"
97-
],
94+
"testMatch": ["<rootDir>/src/**/__tests__/**/*.(j|t)s?(x)", "<rootDir>/src/**/?(*.)(spec|test).(j|t)s?(x)"],
9895
"testEnvironment": "node",
9996
"testURL": "http://localhost",
10097
"transform": {
10198
"^.+\\.(js|jsx|mjs)$": "<rootDir>/node_modules/babel-jest",
10299
"^.+\\.tsx?$": "<rootDir>/config/jest/typescriptTransform.js",
103100
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
104-
"^(?!.*\\.(js|jsx|mjs|css|json)$)":
105-
"<rootDir>/config/jest/fileTransform.js"
101+
"^(?!.*\\.(js|jsx|mjs|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
106102
},
107-
"transformIgnorePatterns": [
108-
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|ts|tsx)$"
109-
],
103+
"transformIgnorePatterns": ["[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|ts|tsx)$"],
110104
"moduleNameMapper": {
111105
"^react-native$": "react-native-web"
112106
},
113-
"moduleFileExtensions": [
114-
"web.ts",
115-
"ts",
116-
"web.tsx",
117-
"tsx",
118-
"web.js",
119-
"js",
120-
"web.jsx",
121-
"jsx",
122-
"json",
123-
"node",
124-
"mjs"
125-
],
107+
"moduleFileExtensions": ["web.ts", "ts", "web.tsx", "tsx", "web.js", "js", "web.jsx", "jsx", "json", "node", "mjs"],
126108
"globals": {
127109
"ts-jest": {
128-
"tsConfigFile":
129-
"/Users/junlin/Projects/diary/diary-front/tsconfig.test.json"
110+
"tsConfigFile": "/Users/junlin/Projects/diary/diary-front/tsconfig.test.json"
130111
}
131112
}
132113
},

‎diary-front/src/components/DiaryApp.tsx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,8 @@ class DiaryApp extends React.Component<Props & ReduxProps, State> {
8585
}
8686
}
8787

88-
export default withRouter(connect<ReduxProps, {}, Props>(
89-
(state: ReduxState) => {
90-
return {
91-
user: state.user,
92-
};
93-
}
94-
)(DiaryApp) as any);
88+
export default withRouter(connect<ReduxProps, {}, Props>((state: ReduxState) => {
89+
return {
90+
user: state.user,
91+
};
92+
})(DiaryApp) as any);

‎diary-front/src/components/DiaryHeaderContainer.tsx‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,14 @@ class DiaryHeaderContainer extends React.Component<Props & ReduxProps> {
4848
<Layout.Header className="DiaryHeaderContainer noLogin">
4949
<div className="DiaryAppTitleDiv logo">
5050
<h1>DiaryApp</h1>
51-
<h4 className="grey">
52-
{process.env.NODE_ENV === 'production' ? 'PROD' : 'DEV'}
53-
</h4>
51+
<h4 className="grey">{process.env.NODE_ENV === 'production' ? 'PROD' : 'DEV'}</h4>
5452
&nbsp;
5553
<h4 className="grey">v{backendVersion}</h4>
5654
</div>
5755
<Menu theme="light" mode="horizontal">
5856
<Menu.Item key="issue">
5957
<Button>
60-
<a
61-
target="_blank"
62-
href="https://github.com/boyangwang/diary/issues/new"
63-
>
58+
<a target="_blank" href="https://github.com/boyangwang/diary/issues/new">
6459
Issue
6560
</a>
6661
</Button>
@@ -90,9 +85,7 @@ class DiaryHeaderContainer extends React.Component<Props & ReduxProps> {
9085
<div className="DiaryAppTitleDiv logo">
9186
<h1>DiaryApp</h1>
9287
<h4 className="grey">
93-
{process.env.NODE_ENV === 'production' ? 'PROD' : 'DEV'}&nbsp;v{
94-
backendVersion
95-
}
88+
{process.env.NODE_ENV === 'production' ? 'PROD' : 'DEV'}&nbsp;v{backendVersion}
9689
</h4>
9790
</div>
9891
</Menu.Item>
@@ -111,10 +104,7 @@ class DiaryHeaderContainer extends React.Component<Props & ReduxProps> {
111104
</Menu.Item>
112105
<Menu.Divider />
113106
<Menu.Item key="issue">
114-
<a
115-
target="_blank"
116-
href="https://github.com/boyangwang/diary/issues/new"
117-
>
107+
<a target="_blank" href="https://github.com/boyangwang/diary/issues/new">
118108
Issue
119109
</a>
120110
</Menu.Item>
@@ -162,11 +152,7 @@ class DiaryHeaderContainer extends React.Component<Props & ReduxProps> {
162152
</NavLink>
163153
</Menu.Item>
164154
<Menu.Item key="user" className="DiaryHeaderMenuItemContainer user">
165-
<Dropdown
166-
overlay={userMenuItem}
167-
trigger={['click']}
168-
placement="topRight"
169-
>
155+
<Dropdown overlay={userMenuItem} trigger={['click']} placement="topRight">
170156
<Button className="userButton" icon="user" />
171157
</Dropdown>
172158
</Menu.Item>

‎diary-front/src/components/DiaryLoginView.tsx‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ class LoginFormValues {
2020
public username: string;
2121
public password: string;
2222
}
23-
class NormalLoginForm extends React.Component<
24-
Props & FormComponentProps,
25-
State
26-
> {
23+
class NormalLoginForm extends React.Component<Props & FormComponentProps, State> {
2724
constructor(props: Props & FormComponentProps) {
2825
super(props);
2926
this.state = new State();
@@ -32,28 +29,26 @@ class NormalLoginForm extends React.Component<
3229
public handleSubmit = (e: any) => {
3330
this.setState({ loading: true });
3431
e.preventDefault();
35-
this.props.form.validateFields(
36-
(validateErr: any, values: LoginFormValues) => {
37-
if (!validateErr) {
38-
api.login(values).then(
39-
(data: LoginResponse & ErrResponse) => {
40-
if (data.err) {
41-
message.warn('' + data.err);
42-
this.setState({ loading: false });
43-
} else {
44-
dispatch({
45-
type: 'LOGIN',
46-
payload: { user: data.data.user },
47-
});
48-
}
49-
},
50-
(err) => {
32+
this.props.form.validateFields((validateErr: any, values: LoginFormValues) => {
33+
if (!validateErr) {
34+
api.login(values).then(
35+
(data: LoginResponse & ErrResponse) => {
36+
if (data.err) {
37+
message.warn('' + data.err);
5138
this.setState({ loading: false });
39+
} else {
40+
dispatch({
41+
type: 'LOGIN',
42+
payload: { user: data.data.user },
43+
});
5244
}
53-
);
54-
}
45+
},
46+
(err) => {
47+
this.setState({ loading: false });
48+
}
49+
);
5550
}
56-
);
51+
});
5752
};
5853

5954
public render() {
@@ -90,11 +85,7 @@ class NormalLoginForm extends React.Component<
9085
<Checkbox>Remember me</Checkbox>
9186
)} */}
9287
{/* <a className="login-form-forgot" href="">Forgot password</a> */}
93-
<Button
94-
type="primary"
95-
htmlType="submit"
96-
className="login-form-button"
97-
>
88+
<Button type="primary" htmlType="submit" className="login-form-button">
9889
Log in
9990
</Button>
10091
<Button
@@ -103,8 +94,7 @@ class NormalLoginForm extends React.Component<
10394
href="/api/oauth/github"
10495
onClick={() => this.setState({ loading: true })}
10596
>
106-
<Icon type="github" /> Log in using GitHub{' '}
107-
{loading && <Icon type="loading" />}
97+
<Icon type="github" /> Log in using GitHub {loading && <Icon type="loading" />}
10898
</Button>
10999
{/* Or <a href="">register now!</a> */}
110100
</Form.Item>

‎diary-front/src/components/DigestModule/DigestAllListContainer.tsx‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,21 @@ class DigestAllContainer extends React.Component<Props & ReduxProps, State> {
3232
const { digests } = this.props;
3333
const { tickedTags } = this.state;
3434

35-
return digests.filter(
36-
(d) =>
37-
d.tags.length === 0 || d.tags.some((tag) => tickedTags.includes(tag))
38-
);
35+
return digests.filter((d) => d.tags.length === 0 || d.tags.some((tag) => tickedTags.includes(tag)));
3936
}
4037

4138
public findShouldShowDigests(digests: Digest[]) {
4239
const { currentPage, pageSize } = this.state;
4340

4441
const sortedByStickyThenModifiedThenCreated = util.sortDigests(digests);
4542

46-
const currentPageDigests = util.findCurrentPageItems(
47-
sortedByStickyThenModifiedThenCreated,
48-
pageSize,
49-
currentPage
50-
);
43+
const currentPageDigests = util.findCurrentPageItems(sortedByStickyThenModifiedThenCreated, pageSize, currentPage);
5144

5245
return currentPageDigests;
5346
}
5447

5548
public getAllTags() {
56-
return [
57-
...new Set([].concat(...(this.props.digests.map((d) => d.tags) as any))),
58-
].sort();
49+
return [...new Set([].concat(...(this.props.digests.map((d) => d.tags) as any)))].sort();
5950
}
6051

6152
public render() {
@@ -84,12 +75,7 @@ class DigestAllContainer extends React.Component<Props & ReduxProps, State> {
8475

8576
return (
8677
<Collapse className="DigestAllContainer">
87-
<Collapse.Panel
88-
header={header}
89-
key="all"
90-
showArrow={false}
91-
forceRender={true}
92-
>
78+
<Collapse.Panel header={header} key="all" showArrow={false} forceRender={true}>
9379
<List
9480
dataSource={shouldShowDigests}
9581
renderItem={(digest: Digest) => <DigestObject digest={digest} />}
@@ -98,8 +84,7 @@ class DigestAllContainer extends React.Component<Props & ReduxProps, State> {
9884
current: currentPage,
9985
total: digestsAfterFilter.length,
10086
showTotal: (total: number) => `Total ${total} digests`,
101-
onChange: (newPage: number) =>
102-
this.setState({ currentPage: newPage }),
87+
onChange: (newPage: number) => this.setState({ currentPage: newPage }),
10388
}}
10489
/>
10590
</Collapse.Panel>

‎diary-front/src/components/DigestModule/DigestFormContainer.tsx‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ import { dispatch } from 'reducers/store';
1313
import api, { Digest, ErrResponse, PostDigestResponse } from 'utils/api';
1414
import util from 'utils/util';
1515

16-
import DigestEditorObject, {
17-
draftToHtml,
18-
EmptyState,
19-
htmlToDraft,
20-
} from 'components/DigestModule/DigestEditorObject';
16+
import DigestEditorObject, { draftToHtml, EmptyState, htmlToDraft } from 'components/DigestModule/DigestEditorObject';
2117
import DigestTagsObject from 'components/DigestModule/DigestTagsObject';
2218

2319
class Props {
@@ -46,19 +42,13 @@ class DigestFormValues {
4642
public tags: string[];
4743
public content: EditorState;
4844
}
49-
class DigestFormContainer extends React.Component<
50-
Props & PropsDefaults & ReduxProps & FormComponentProps,
51-
State
52-
> {
45+
class DigestFormContainer extends React.Component<Props & PropsDefaults & ReduxProps & FormComponentProps, State> {
5346
public static defaultProps = new PropsDefaults();
5447
public initialEditorState: EditorState;
5548

5649
constructor(props: Props & PropsDefaults & ReduxProps & FormComponentProps) {
5750
super(props);
58-
const editorValue =
59-
(this.props.digest && this.props.digest.content) ||
60-
this.props.unsavedDraft ||
61-
'';
51+
const editorValue = (this.props.digest && this.props.digest.content) || this.props.unsavedDraft || '';
6252
this.initialEditorState = htmlToDraft(editorValue);
6353

6454
const tags = (this.props.digest && this.props.digest.tags) || [];
@@ -122,9 +112,7 @@ class DigestFormContainer extends React.Component<
122112
if (!user) {
123113
return;
124114
}
125-
const filename = `digest-${
126-
user.username
127-
}-${new Date().toISOString()}-${util.genRandomString()}`;
115+
const filename = `digest-${user.username}-${new Date().toISOString()}-${util.genRandomString()}`;
128116
// file is File object type
129117
form.append('image', file, filename);
130118
return api.uploadImage(form, user.username).then(
@@ -158,9 +146,7 @@ class DigestFormContainer extends React.Component<
158146
<Form.Item>
159147
{getFieldDecorator('createTimestamp', {
160148
rules: [],
161-
initialValue: moment(
162-
_.get(digest, 'createTimestamp') || Date.now()
163-
),
149+
initialValue: moment(_.get(digest, 'createTimestamp') || Date.now()),
164150
})(<DatePicker showTime={true} format="YYYY-MM-DD HH:mm:ss" />)}
165151
</Form.Item>
166152
<Form.Item>
@@ -194,10 +180,7 @@ class DigestFormContainer extends React.Component<
194180
rules: [],
195181
initialValue: _.get(digest, 'content') || unsavedDraft || '',
196182
normalize: (value: any, prevValue: any, allValues: any) => {
197-
localStorage.setItem(
198-
'diary.digest.unsavedDraft',
199-
draftToHtml(value)
200-
);
183+
localStorage.setItem('diary.digest.unsavedDraft', draftToHtml(value));
201184
return value;
202185
},
203186
})(

0 commit comments

Comments
 (0)