From 8029e07e2061e4f6224e82139816e960ff40fd9f Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Tue, 16 Oct 2018 15:55:31 +0800 Subject: [PATCH] style: format code --- src/components/FileExplorer.js | 15 +++++-------- src/components/Gitako.js | 10 ++++----- src/components/Icon.js | 36 ++++++++++++++---------------- src/components/LoadingIndicator.js | 2 +- src/components/Node.js | 10 ++++----- src/components/PJAXLink.js | 2 +- src/components/Resizable.js | 4 ++-- src/components/ResizeHandler.js | 5 ++--- src/components/SettingsBar.js | 7 +++--- src/components/SideBar.js | 21 ++++++++--------- src/components/ToggleShowButton.js | 5 ++--- src/content.js | 7 +++--- src/driver/core/FileExplorer.js | 8 +++---- src/driver/core/Gitako.js | 2 +- src/driver/core/SideBar.js | 10 ++++----- src/utils/GitHubHelper.js | 2 +- src/utils/configHelper.js | 4 ++-- src/utils/treeParser.js | 2 +- 18 files changed, 68 insertions(+), 84 deletions(-) diff --git a/src/components/FileExplorer.js b/src/components/FileExplorer.js index 568a436..333837a 100644 --- a/src/components/FileExplorer.js +++ b/src/components/FileExplorer.js @@ -1,14 +1,11 @@ import React from 'react' import PropTypes from 'prop-types' - -import connect from '../driver/connect' -import { FileExplorer as FileExplorerCore } from '../driver/core' - -import SearchBar from './SearchBar' -import Node from './Node' -import LoadingIndicator from './LoadingIndicator' - -import cx from '../utils/cx' +import connect from 'driver/connect' +import { FileExplorer as FileExplorerCore } from 'driver/core' +import SearchBar from 'components/SearchBar' +import Node from 'components/Node' +import LoadingIndicator from 'components/LoadingIndicator' +import cx from 'utils/cx' @connect(FileExplorerCore) export default class FileExplorer extends React.Component { diff --git a/src/components/Gitako.js b/src/components/Gitako.js index d9d3c8f..aec2575 100644 --- a/src/components/Gitako.js +++ b/src/components/Gitako.js @@ -1,10 +1,8 @@ import React from 'react' -import SideBar from './SideBar' - -import { Gitako as GitakoCore } from '../driver/core' -import connect from '../driver/connect' - -import { raiseError } from '../analytics' +import SideBar from 'components/SideBar' +import { Gitako as GitakoCore } from 'driver/core' +import connect from 'driver/connect' +import { raiseError } from 'analytics' @connect(GitakoCore) export default class Gitako extends React.PureComponent { diff --git a/src/components/Icon.js b/src/components/Icon.js index 1723529..4f952e4 100644 --- a/src/components/Icon.js +++ b/src/components/Icon.js @@ -1,23 +1,21 @@ import React from 'react' - -import Submodule from '../assets/icons/octicons/file-submodule.svg?svgr' -import Grabber from '../assets/icons/octicons/grabber.svg?svgr' -import Octoface from '../assets/icons/octicons/octoface.svg?svgr' -import ChevronDown from '../assets/icons/octicons/chevron-down.svg?svgr' -import TriangleRight from '../assets/icons/octicons/triangle-right.svg?svgr' -import FilePdf from '../assets/icons/octicons/file-pdf.svg?svgr' -import File from '../assets/icons/octicons/file.svg?svgr' -import FileZip from '../assets/icons/octicons/file-zip.svg?svgr' -import Markdown from '../assets/icons/octicons/markdown.svg?svgr' -import FileMedia from '../assets/icons/octicons/file-media.svg?svgr' -import FileCode from '../assets/icons/octicons/file-code.svg?svgr' -// import FileBinary from '../assets/icons/octicons/file-binary.svg?svgr' -// import FileSymlinkDirectory from '../assets/icons/octicons/file-symlink-directory.svg?svgr' -// import FileSymlinkFile from '../assets/icons/octicons/file-symlink-file.svg?svgr' -import X from '../assets/icons/octicons/x.svg?svgr' -import Gear from '../assets/icons/octicons/gear.svg?svgr' - -import cx from '../utils/cx' +import Submodule from 'assets/icons/octicons/file-submodule.svg?svgr' +import Grabber from 'assets/icons/octicons/grabber.svg?svgr' +import Octoface from 'assets/icons/octicons/octoface.svg?svgr' +import ChevronDown from 'assets/icons/octicons/chevron-down.svg?svgr' +import TriangleRight from 'assets/icons/octicons/triangle-right.svg?svgr' +import FilePdf from 'assets/icons/octicons/file-pdf.svg?svgr' +import File from 'assets/icons/octicons/file.svg?svgr' +import FileZip from 'assets/icons/octicons/file-zip.svg?svgr' +import Markdown from 'assets/icons/octicons/markdown.svg?svgr' +import FileMedia from 'assets/icons/octicons/file-media.svg?svgr' +import FileCode from 'assets/icons/octicons/file-code.svg?svgr' +// import FileBinary from 'assets/icons/octicons/file-binary.svg?svgr' +// import FileSymlinkDirectory from 'assets/icons/octicons/file-symlink-directory.svg?svgr' +// import FileSymlinkFile from 'assets/icons/octicons/file-symlink-file.svg?svgr' +import X from 'assets/icons/octicons/x.svg?svgr' +import Gear from 'assets/icons/octicons/gear.svg?svgr' +import cx from 'utils/cx' function getSVGIconComponent(type) { switch (type) { diff --git a/src/components/LoadingIndicator.js b/src/components/LoadingIndicator.js index dfecccd..5aca587 100644 --- a/src/components/LoadingIndicator.js +++ b/src/components/LoadingIndicator.js @@ -1,5 +1,5 @@ import React from 'react' -import Icon from './Icon'; +import Icon from 'components/Icon'; export default function LoadingIndicator({ text }) { return ( diff --git a/src/components/Node.js b/src/components/Node.js index 26e8e08..3b6130f 100644 --- a/src/components/Node.js +++ b/src/components/Node.js @@ -1,10 +1,8 @@ import React from 'react' - -import Icon from './Icon' - -import cx from '../utils/cx' -import DOMHelper from '../utils/DOMHelper' -import LoadingIndicator from './LoadingIndicator'; +import Icon from 'components/Icon' +import cx from 'utils/cx' +import DOMHelper from 'utils/DOMHelper' +import LoadingIndicator from 'components/LoadingIndicator'; function getIconType(node) { switch (node.type) { diff --git a/src/components/PJAXLink.js b/src/components/PJAXLink.js index 6d4c723..6e87cc3 100644 --- a/src/components/PJAXLink.js +++ b/src/components/PJAXLink.js @@ -1,5 +1,5 @@ import React from 'react' -import DOMHelper from '../utils/DOMHelper' +import DOMHelper from 'utils/DOMHelper' export default function PJAXLink({ to, children }) { return React.cloneElement(children, { diff --git a/src/components/Resizable.js b/src/components/Resizable.js index bb92be8..1bef6a7 100644 --- a/src/components/Resizable.js +++ b/src/components/Resizable.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' -import ResizeHandler from './ResizeHandler' -import cx from '../utils/cx'; +import ResizeHandler from 'components/ResizeHandler' +import cx from 'utils/cx'; export default class Resizable extends React.PureComponent { static propTypes = { diff --git a/src/components/ResizeHandler.js b/src/components/ResizeHandler.js index b79a6d8..328742a 100644 --- a/src/components/ResizeHandler.js +++ b/src/components/ResizeHandler.js @@ -1,6 +1,5 @@ import React from 'react' - -import Icon from './Icon' +import Icon from 'components/Icon' export default class ResizeHandler extends React.PureComponent { pointerDown = false @@ -56,4 +55,4 @@ export default class ResizeHandler extends React.PureComponent { ) } -} \ No newline at end of file +} diff --git a/src/components/SettingsBar.js b/src/components/SettingsBar.js index 71082dc..d6a442d 100644 --- a/src/components/SettingsBar.js +++ b/src/components/SettingsBar.js @@ -1,10 +1,9 @@ import React from 'react' import PropTypes from 'prop-types' - +import Icon from 'components/Icon' +import configHelper, { config } from 'utils/configHelper' +import keyHelper from 'utils/keyHelper' import { version } from '../../package' -import Icon from './Icon' -import configHelper, { config } from '../utils/configHelper' -import keyHelper from '../utils/keyHelper' const wikiLinks = { compressSingletonFolder: 'https://github.com/EnixCoda/Gitako/wiki/Compress-Singleton-Folder', diff --git a/src/components/SideBar.js b/src/components/SideBar.js index 96c024f..6b7611d 100644 --- a/src/components/SideBar.js +++ b/src/components/SideBar.js @@ -1,17 +1,14 @@ import React from 'react' import PropTypes from 'prop-types' - -import { SideBar as SideBarCore } from '../driver/core' -import connect from '../driver/connect' - -import FileExplorer from './FileExplorer' -import ToggleShowButton from './ToggleShowButton' -import MetaBar from './MetaBar' -import SettingsBar from './SettingsBar' -import Portal from './Portal' -import Resizable from './Resizable' - -import cx from '../utils/cx' +import { SideBar as SideBarCore } from 'driver/core' +import connect from 'driver/connect' +import FileExplorer from 'components/FileExplorer' +import ToggleShowButton from 'components/ToggleShowButton' +import MetaBar from 'components/MetaBar' +import SettingsBar from 'components/SettingsBar' +import Portal from 'components/Portal' +import Resizable from 'components/Resizable' +import cx from 'utils/cx' @connect(SideBarCore) export default class Gitako extends React.PureComponent { diff --git a/src/components/ToggleShowButton.js b/src/components/ToggleShowButton.js index f57e607..df15d4a 100644 --- a/src/components/ToggleShowButton.js +++ b/src/components/ToggleShowButton.js @@ -1,7 +1,6 @@ import React from 'react' -import Icon from './Icon' - -import cx from '../utils/cx' +import Icon from 'components/Icon' +import cx from 'utils/cx' export default function Logo({ error, shouldShow, toggleShowSideBar }) { return ( diff --git a/src/content.js b/src/content.js index b553ce6..b86067f 100644 --- a/src/content.js +++ b/src/content.js @@ -1,9 +1,8 @@ import React from 'react' import ReactDOM from 'react-dom' - -import Gitako from './components/Gitako' -import { addMiddleware } from './driver/connect' -import { withErrorLog } from './analytics' +import Gitako from 'components/Gitako' +import { addMiddleware } from 'driver/connect' +import { withErrorLog } from 'analytics' import './content.less' diff --git a/src/driver/core/FileExplorer.js b/src/driver/core/FileExplorer.js index 5c4294d..d072c9a 100644 --- a/src/driver/core/FileExplorer.js +++ b/src/driver/core/FileExplorer.js @@ -1,7 +1,7 @@ -import DOMHelper from '../../utils/DOMHelper' -import treeParser from '../../utils/treeParser' -import URLHelper from '../../utils/URLHelper' -import VisibleNodesGenerator from '../../utils/VisibleNodesGenerator' +import DOMHelper from 'utils/DOMHelper' +import treeParser from 'utils/treeParser' +import URLHelper from 'utils/URLHelper' +import VisibleNodesGenerator from 'utils/VisibleNodesGenerator' function getVisibleParentNode(nodes, focusedNode, depths) { const focusedNodeIndex = nodes.indexOf(focusedNode) diff --git a/src/driver/core/Gitako.js b/src/driver/core/Gitako.js index d23a533..b0512c1 100644 --- a/src/driver/core/Gitako.js +++ b/src/driver/core/Gitako.js @@ -1,4 +1,4 @@ -import DOMHelper from '../../utils/DOMHelper' +import DOMHelper from 'utils/DOMHelper' const init = dispatch => () => { DOMHelper.decorateGitHubPageContent() diff --git a/src/driver/core/SideBar.js b/src/driver/core/SideBar.js index 47d427c..6b2853c 100644 --- a/src/driver/core/SideBar.js +++ b/src/driver/core/SideBar.js @@ -1,8 +1,8 @@ -import DOMHelper, { REPO_TYPE_PRIVATE } from '../../utils/DOMHelper' -import GitHubHelper, { NOT_FOUND, BAD_CREDENTIALS } from '../../utils/GitHubHelper' -import configHelper from '../../utils/configHelper' -import URLHelper from '../../utils/URLHelper' -import keyHelper from '../../utils/keyHelper' +import DOMHelper, { REPO_TYPE_PRIVATE } from 'utils/DOMHelper' +import GitHubHelper, { NOT_FOUND, BAD_CREDENTIALS } from 'utils/GitHubHelper' +import configHelper from 'utils/configHelper' +import URLHelper from 'utils/URLHelper' +import keyHelper from 'utils/keyHelper' const init = dispatch => async () => { try { diff --git a/src/utils/GitHubHelper.js b/src/utils/GitHubHelper.js index 76535c3..ccf1c36 100644 --- a/src/utils/GitHubHelper.js +++ b/src/utils/GitHubHelper.js @@ -1,4 +1,4 @@ -import { raiseError } from '../analytics' +import { raiseError } from 'analytics' export const NOT_FOUND = 'Repo Not Found' export const BAD_CREDENTIALS = 'Bad credentials' diff --git a/src/utils/configHelper.js b/src/utils/configHelper.js index 17f67be..f892577 100644 --- a/src/utils/configHelper.js +++ b/src/utils/configHelper.js @@ -1,5 +1,5 @@ -import storageHelper from './storageHelper' -import { pick } from './general' +import storageHelper from 'utils/storageHelper' +import { pick } from 'utils/general' export const config = { shortcut: 'shortcut', diff --git a/src/utils/treeParser.js b/src/utils/treeParser.js index e25488e..2ebbe62 100644 --- a/src/utils/treeParser.js +++ b/src/utils/treeParser.js @@ -1,4 +1,4 @@ -import GitHubHelper from './GitHubHelper' +import GitHubHelper from 'utils/GitHubHelper' const nodeTemplate = { name: null,