Skip to content

Commit

Permalink
style: line code
Browse files Browse the repository at this point in the history
  • Loading branch information
DiamondYuan committed May 25, 2019
1 parent 734481e commit d914cd1
Show file tree
Hide file tree
Showing 43 changed files with 212 additions and 602 deletions.
4 changes: 3 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"singleQuote": true,
"trailingComma": "es5"
"trailingComma": "es5",
"printWidth": 100,
"proseWrap": "never"
}
4 changes: 1 addition & 3 deletions src/browser/content/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ const listeners = new MessageListenerCombiner()
.case(clickIcon, () => {
if ($(`.${styles.toolFrame}`).length === 0) {
$('body').append(
`<iframe src="${chrome.extension.getURL('tool.html')}" class=${
styles.toolFrame
}></iframe>`
`<iframe src="${chrome.extension.getURL('tool.html')}" class=${styles.toolFrame}></iframe>`
);
} else {
$(`.${styles.toolFrame}`).toggle();
Expand Down
5 changes: 1 addition & 4 deletions src/common/ListenerCombiner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ interface Case<P> {
}

interface ListenerCombiner {
case<P>(
actionCreator: ActionCreator<P>,
handler: Handler<P>
): ListenerCombiner;
case<P>(actionCreator: ActionCreator<P>, handler: Handler<P>): ListenerCombiner;
}

export class MessageListenerCombiner implements ListenerCombiner {
Expand Down
10 changes: 2 additions & 8 deletions src/common/areaSelector/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,8 @@ export default class AreaSelector {
});
$(element).css('top', area.leftTop!.clientY);
$(element).css('left', area.leftTop!.clientX);
$(element).css(
'height',
area.rightBottom!.clientY - area.leftTop!.clientY
);
$(element).css(
'width',
area.rightBottom!.clientX - area.leftTop!.clientX
);
$(element).css('height', area.rightBottom!.clientY - area.leftTop!.clientY);
$(element).css('width', area.rightBottom!.clientX - area.leftTop!.clientX);
}
};
}
14 changes: 4 additions & 10 deletions src/common/backend/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,11 @@ const services: ServiceMeta[] = serviceContext.keys().map(key => {
return serviceContext(key).default;
});

const imageHostingContext = require.context(
'./imageHosting',
true,
/index.ts$/
);
const imageHostingContext = require.context('./imageHosting', true, /index.ts$/);

const imageHostingServices: ImageHostingServiceMeta[] = imageHostingContext
.keys()
.map(key => {
return imageHostingContext(key).default;
});
const imageHostingServices: ImageHostingServiceMeta[] = imageHostingContext.keys().map(key => {
return imageHostingContext(key).default;
});

export function documentServiceFactory(type: string, info?: any) {
const service = services.find(o => o.type === type);
Expand Down
17 changes: 3 additions & 14 deletions src/common/backend/services/github/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ import {
GithubRepositoryResponse,
GithubRepository,
} from './interface';
import {
DocumentService,
Repository,
CreateDocumentRequest,
} from '../../index';
import { DocumentService, Repository, CreateDocumentRequest } from '../../index';
import axios, { AxiosInstance } from 'axios';
import { md5 } from '../../../md5';

Expand Down Expand Up @@ -46,12 +42,7 @@ export default class GithubDocumentService implements DocumentService {

getUserInfo = async () => {
const data = await this.request.get<GithubUserInfoResponse>('user');
const {
name,
avatar_url: avatar,
html_url: homePage,
bio: description,
} = data.data;
const { name, avatar_url: avatar, html_url: homePage, bio: description } = data.data;
return {
name,
avatar,
Expand Down Expand Up @@ -81,9 +72,7 @@ export default class GithubDocumentService implements DocumentService {
);
};

createDocument = async (
info: CreateDocumentRequest
): Promise<CompleteStatus> => {
createDocument = async (info: CreateDocumentRequest): Promise<CompleteStatus> => {
if (!this.repositories) {
this.getRepositories();
}
Expand Down
18 changes: 4 additions & 14 deletions src/common/backend/services/notion/service.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { CompleteStatus } from './../interface';
import {
DocumentService,
Repository,
CreateDocumentRequest,
} from '../../index';
import { DocumentService, Repository, CreateDocumentRequest } from '../../index';
import axios, { AxiosInstance } from 'axios';
import { generateUuid } from '../../../uuid';

Expand Down Expand Up @@ -147,10 +143,7 @@ export default class NotionDocumentService implements DocumentService {
throw new Error('仓库非法');
}
return {
href: `https://www.notion.so/${repository.groupId}/${documentId.replace(
/-/g,
''
)}`,
href: `https://www.notion.so/${repository.groupId}/${documentId.replace(/-/g, '')}`,
};
};

Expand All @@ -159,8 +152,7 @@ export default class NotionDocumentService implements DocumentService {
this.userContent = await this.getUserContent();
}
const documentId = generateUuid();
const userId = Object.values(this.userContent.recordMap.notion_user)[0]
.value.id;
const userId = Object.values(this.userContent.recordMap.notion_user)[0].value.id;
const time = new Date().getDate();
await this.request.post('api/v3/submitTransaction', {
operations: [
Expand Down Expand Up @@ -244,9 +236,7 @@ export default class NotionDocumentService implements DocumentService {
};

private getUserContent = async () => {
const response = await this.request.post<NotionUserContent>(
'api/v3/loadUserContent'
);
const response = await this.request.post<NotionUserContent>('api/v3/loadUserContent');
return response.data;
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ interface PageProps {
}
const quickResponseCodeHost = 'https://yuquewebclipper.diamondyuan.com/pro/';

export default class QuickResponseCode extends React.Component<
PageProps,
PageState
> {
export default class QuickResponseCode extends React.Component<PageProps, PageState> {
constructor(props: PageProps) {
super(props);
this.state = {
Expand Down Expand Up @@ -71,9 +68,7 @@ export default class QuickResponseCode extends React.Component<
<Switch onChange={this.handleChange} />
</div>
<div className={styles.quickResponseCodeContainer}>
{this.state.quickResponseCodeData && (
<img src={this.state.quickResponseCodeData} />
)}
{this.state.quickResponseCodeData && <img src={this.state.quickResponseCodeData} />}
</div>
</Section>
);
Expand Down
43 changes: 9 additions & 34 deletions src/common/backend/services/yuque/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,31 +62,21 @@ export default class YuqueDocumentService implements DocumentService {
if (!this.userInfo) {
this.userInfo = await this.getYuqueUserInfo();
}
const repos = await this.getAllRepositories(
false,
this.userInfo.id,
this.userInfo.name
);
const repos = await this.getAllRepositories(false, this.userInfo.id, this.userInfo.name);
response = response.concat(repos);
}
if (this.config.repositoryType !== RepositoryType.self) {
const groups = await this.getUserGroups();
for (const group of groups) {
const repos = await this.getAllRepositories(
false,
group.id,
group.name
);
const repos = await this.getAllRepositories(false, group.id, group.name);
response = response.concat(repos);
}
}
this.repositories = response;
return response.map(({ namespace, ...rest }) => ({ ...rest }));
};

createDocument = async (
info: CreateDocumentRequest
): Promise<YuqueCompleteStatus> => {
createDocument = async (info: CreateDocumentRequest): Promise<YuqueCompleteStatus> => {
if (!this.userInfo) {
this.userInfo = await this.getYuqueUserInfo();
}
Expand Down Expand Up @@ -119,32 +109,21 @@ export default class YuqueDocumentService implements DocumentService {
if (!this.userInfo) {
this.userInfo = await this.getYuqueUserInfo();
}
return (await this.request.get<YuqueGroupResponse[]>(
`users/${this.userInfo.login}/groups`
)).data;
return (await this.request.get<YuqueGroupResponse[]>(`users/${this.userInfo.login}/groups`))
.data;
};

private getYuqueUserInfo = async () => {
const response = await this.request.get<YuqueUserInfoResponse>('user');
return response.data;
};

private getAllRepositories = async (
isGroup: boolean,
groupId: number,
groupName: string
) => {
private getAllRepositories = async (isGroup: boolean, groupId: number, groupName: string) => {
let offset = 0;
let result = await this.getYuqueRepositories(
offset,
isGroup,
String(groupId)
);
let result = await this.getYuqueRepositories(offset, isGroup, String(groupId));
while (result.length - offset === 20) {
offset = offset + 20;
result = result.concat(
await this.getYuqueRepositories(offset, isGroup, String(groupId))
);
result = result.concat(await this.getYuqueRepositories(offset, isGroup, String(groupId)));
}
return result.map(
({ id, name, namespace }): YuqueRepository => ({
Expand All @@ -157,11 +136,7 @@ export default class YuqueDocumentService implements DocumentService {
);
};

private getYuqueRepositories = async (
offset: number,
isGroup: boolean,
slug: string
) => {
private getYuqueRepositories = async (offset: number, isGroup: boolean, slug: string) => {
const query = {
offset: offset,
};
Expand Down
5 changes: 1 addition & 4 deletions src/common/browser/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ class ChromeBrowserService implements BrowserService {
});
};

sendActionByTabId = function<T>(
tabId: number,
action: AnyAction
): Promise<T> {
sendActionByTabId = function<T>(tabId: number, action: AnyAction): Promise<T> {
return new Promise<T>(resolve => {
chrome.tabs.sendMessage(tabId, action, (re: T) => {
resolve(re);
Expand Down
10 changes: 2 additions & 8 deletions src/common/browser/tabs/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
export interface ITabs {
executeScript<T>(
tabId: number,
details: chrome.tabs.InjectDetails
): Promise<T[]>;
executeScript<T>(tabId: number, details: chrome.tabs.InjectDetails): Promise<T[]>;
}

class ChromeTabs implements ITabs {
public executeScript = async <T>(
tabId: number,
details: chrome.tabs.InjectDetails
) => {
public executeScript = async <T>(tabId: number, details: chrome.tabs.InjectDetails) => {
return new Promise<T[]>(resolve => {
chrome.tabs.executeScript(tabId, details, resolve);
});
Expand Down
22 changes: 5 additions & 17 deletions src/common/storage/__test__/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import { AccountPreference } from './../../../store/reducers/userPreference/inte
/* eslint-disable max-nested-callbacks */
/* eslint-disable no-undefined */
import update from 'immutability-helper';
import {
TypedCommonStorage,
CommonStorage,
TypedCommonStorageInterface,
} from '../index';
import { TypedCommonStorage, CommonStorage, TypedCommonStorageInterface } from '../index';

class MockStorage implements CommonStorage {
private data: any;
Expand Down Expand Up @@ -42,18 +38,10 @@ describe('test storage', () => {
it('The default value should be correct', async () => {
expect(await storage.getPreference()).toEqual(defaultPreference);
expect(await storage.getAccounts()).toEqual(defaultPreference.accounts);
expect(await storage.getDefaultAccountId()).toEqual(
defaultPreference.defaultAccountId
);
expect(await storage.getDefaultPluginId()).toEqual(
defaultPreference.defaultPluginId
);
expect(await storage.getShowLineNumber()).toEqual(
defaultPreference.showLineNumber
);
expect(await storage.getLiveRendering()).toEqual(
defaultPreference.liveRendering
);
expect(await storage.getDefaultAccountId()).toEqual(defaultPreference.defaultAccountId);
expect(await storage.getDefaultPluginId()).toEqual(defaultPreference.defaultPluginId);
expect(await storage.getShowLineNumber()).toEqual(defaultPreference.showLineNumber);
expect(await storage.getLiveRendering()).toEqual(defaultPreference.liveRendering);
});

describe('config account should work correctly', () => {
Expand Down
26 changes: 6 additions & 20 deletions src/common/storage/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { PreferenceStorage } from './interface';
import {
ImageHosting,
AccountPreference,
} from './../../store/reducers/userPreference/interface';
import { ImageHosting, AccountPreference } from './../../store/reducers/userPreference/interface';
export * from './interface';
export interface CommonStorage {
set(key: string, value: any): void | Promise<void>;
Expand Down Expand Up @@ -82,10 +79,7 @@ export interface TypedCommonStorageInterface {

deleteImageHostingById(id: string): Promise<ImageHosting[]>;

editImageHostingById(
id: string,
value: ImageHosting
): Promise<ImageHosting[]>;
editImageHostingById(id: string, value: ImageHosting): Promise<ImageHosting[]>;
}

const keysOfStorage = {
Expand Down Expand Up @@ -156,9 +150,7 @@ export class TypedCommonStorage implements TypedCommonStorageInterface {
};

getAccounts = async () => {
const value = await this.store.get<AccountPreference[]>(
keysOfStorage.accounts
);
const value = await this.store.get<AccountPreference[]>(keysOfStorage.accounts);
if (!value) {
return [];
}
Expand Down Expand Up @@ -216,18 +208,14 @@ export class TypedCommonStorage implements TypedCommonStorageInterface {

deleteImageHostingById = async (id: string) => {
const imageHostingList = await this.getImageHosting();
const newImageHostingList = imageHostingList.filter(
imageHosting => imageHosting.id !== id
);
const newImageHostingList = imageHostingList.filter(imageHosting => imageHosting.id !== id);
await this.store.set(keysOfStorage.imageHosting, newImageHostingList);
return newImageHostingList;
};

editImageHostingById = async (id: string, value: ImageHosting) => {
const imageHostingList = await this.getImageHosting();
const index = imageHostingList.findIndex(
imageHosting => imageHosting.id === id
);
const index = imageHostingList.findIndex(imageHosting => imageHosting.id === id);
if (index < 0) {
throw new Error('图床不存在');
}
Expand All @@ -237,6 +225,4 @@ export class TypedCommonStorage implements TypedCommonStorageInterface {
};
}

export default new TypedCommonStorage(
new ChromeSyncStorageImpl()
) as TypedCommonStorageInterface;
export default new TypedCommonStorage(new ChromeSyncStorageImpl()) as TypedCommonStorageInterface;
5 changes: 1 addition & 4 deletions src/common/storage/interface.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
AccountPreference,
ImageHosting,
} from '../../store/reducers/userPreference/interface';
import { AccountPreference, ImageHosting } from '../../store/reducers/userPreference/interface';
export interface PreferenceStorage {
accounts: AccountPreference[];
imageHosting: ImageHosting[];
Expand Down
Loading

0 comments on commit d914cd1

Please sign in to comment.