From aa0f59c90bb56869cff849f90b994f9dbd780422 Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Mon, 24 May 2021 21:11:47 +0800 Subject: [PATCH] chore: move containers --- src/components/FileExplorer.tsx | 2 +- src/components/Gitako.tsx | 10 +++++----- src/components/SideBar.tsx | 8 ++++---- src/{components => containers}/ErrorBoundary.tsx | 0 src/{components => containers}/ErrorContext.tsx | 0 src/{components => containers}/OAuthWrapper.tsx | 0 src/{components => containers}/RepoContext.tsx | 0 src/{components => containers}/SideBarState.tsx | 0 src/{components => containers}/Theme.tsx | 0 src/driver/core/FileExplorer.ts | 2 +- src/utils/hooks/useCatchNetworkError.ts | 4 ++-- src/utils/hooks/useToggleSideBarWithKeyboard.ts | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename src/{components => containers}/ErrorBoundary.tsx (100%) rename src/{components => containers}/ErrorContext.tsx (100%) rename src/{components => containers}/OAuthWrapper.tsx (100%) rename src/{components => containers}/RepoContext.tsx (100%) rename src/{components => containers}/SideBarState.tsx (100%) rename src/{components => containers}/Theme.tsx (100%) diff --git a/src/components/FileExplorer.tsx b/src/components/FileExplorer.tsx index ef43db4..a63172f 100644 --- a/src/components/FileExplorer.tsx +++ b/src/components/FileExplorer.tsx @@ -16,9 +16,9 @@ import { useLoadedContext } from 'utils/hooks/useLoadedContext' import { useOnLocationChange } from 'utils/hooks/useOnLocationChange' import { useOnPJAXDone } from 'utils/hooks/usePJAX' import { VisibleNodes } from 'utils/VisibleNodesGenerator' +import { SideBarStateContext } from '../containers/SideBarState' import { Icon } from './Icon' import { SearchMode, searchModes } from './searchModes' -import { SideBarStateContext } from './SideBarState' import { SizeObserver } from './SizeObserver' type renderNodeContext = { diff --git a/src/components/Gitako.tsx b/src/components/Gitako.tsx index 339efa5..13039b3 100644 --- a/src/components/Gitako.tsx +++ b/src/components/Gitako.tsx @@ -1,11 +1,11 @@ import { SideBar } from 'components/SideBar' import { ConfigsContextWrapper } from 'containers/ConfigsContext' import * as React from 'react' -import { ErrorBoundary } from './ErrorBoundary' -import { StateBarErrorContextWrapper } from './ErrorContext' -import { OAuthWrapper } from './OAuthWrapper' -import { RepoContextWrapper } from './RepoContext' -import { StateBarStateContextWrapper } from './SideBarState' +import { ErrorBoundary } from '../containers/ErrorBoundary' +import { StateBarErrorContextWrapper } from '../containers/ErrorContext' +import { OAuthWrapper } from '../containers/OAuthWrapper' +import { RepoContextWrapper } from '../containers/RepoContext' +import { StateBarStateContextWrapper } from '../containers/SideBarState' export function Gitako() { return ( diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx index e7ba0da..c5a6a47 100644 --- a/src/components/SideBar.tsx +++ b/src/components/SideBar.tsx @@ -17,14 +17,14 @@ import { useLoadedContext } from 'utils/hooks/useLoadedContext' import { loadWithPJAX, useOnPJAXDone, usePJAX } from 'utils/hooks/usePJAX' import { useProgressBar } from 'utils/hooks/useProgressBar' import { useStateIO } from 'utils/hooks/useStateIO' +import { SideBarErrorContext } from '../containers/ErrorContext' +import { RepoContext } from '../containers/RepoContext' +import { SideBarStateContext } from '../containers/SideBarState' +import { Theme } from '../containers/Theme' import { useToggleSideBarWithKeyboard } from '../utils/hooks/useToggleSideBarWithKeyboard' -import { SideBarErrorContext } from './ErrorContext' import { Icon } from './Icon' import { IIFC } from './IIFC' import { LoadingIndicator } from './LoadingIndicator' -import { RepoContext } from './RepoContext' -import { SideBarStateContext } from './SideBarState' -import { Theme } from './Theme' export function SideBar() { const metaData = React.useContext(RepoContext) diff --git a/src/components/ErrorBoundary.tsx b/src/containers/ErrorBoundary.tsx similarity index 100% rename from src/components/ErrorBoundary.tsx rename to src/containers/ErrorBoundary.tsx diff --git a/src/components/ErrorContext.tsx b/src/containers/ErrorContext.tsx similarity index 100% rename from src/components/ErrorContext.tsx rename to src/containers/ErrorContext.tsx diff --git a/src/components/OAuthWrapper.tsx b/src/containers/OAuthWrapper.tsx similarity index 100% rename from src/components/OAuthWrapper.tsx rename to src/containers/OAuthWrapper.tsx diff --git a/src/components/RepoContext.tsx b/src/containers/RepoContext.tsx similarity index 100% rename from src/components/RepoContext.tsx rename to src/containers/RepoContext.tsx diff --git a/src/components/SideBarState.tsx b/src/containers/SideBarState.tsx similarity index 100% rename from src/components/SideBarState.tsx rename to src/containers/SideBarState.tsx diff --git a/src/components/Theme.tsx b/src/containers/Theme.tsx similarity index 100% rename from src/components/Theme.tsx rename to src/containers/Theme.tsx diff --git a/src/driver/core/FileExplorer.ts b/src/driver/core/FileExplorer.ts index 66c8bab..8240357 100644 --- a/src/driver/core/FileExplorer.ts +++ b/src/driver/core/FileExplorer.ts @@ -1,4 +1,4 @@ -import { SideBarStateContextShape } from 'components/SideBarState' +import { SideBarStateContextShape } from 'containers/SideBarState' import { GetCreatedMethod, MethodCreator } from 'driver/connect' import { platform } from 'platforms' import { Config } from 'utils/config/helper' diff --git a/src/utils/hooks/useCatchNetworkError.ts b/src/utils/hooks/useCatchNetworkError.ts index 2cc2488..f236641 100644 --- a/src/utils/hooks/useCatchNetworkError.ts +++ b/src/utils/hooks/useCatchNetworkError.ts @@ -2,8 +2,8 @@ import { useConfigs } from 'containers/ConfigsContext' import { errors, platformName } from 'platforms' import { useCallback } from 'react' import { useLoadedContext } from 'utils/hooks/useLoadedContext' -import { SideBarErrorContext } from '../../components/ErrorContext' -import { SideBarStateContext } from '../../components/SideBarState' +import { SideBarErrorContext } from '../../containers/ErrorContext' +import { SideBarStateContext } from '../../containers/SideBarState' export function useCatchNetworkError() { const { accessToken } = useConfigs().value diff --git a/src/utils/hooks/useToggleSideBarWithKeyboard.ts b/src/utils/hooks/useToggleSideBarWithKeyboard.ts index 821d4d3..19d0a93 100644 --- a/src/utils/hooks/useToggleSideBarWithKeyboard.ts +++ b/src/utils/hooks/useToggleSideBarWithKeyboard.ts @@ -1,7 +1,7 @@ import { ConfigsContextShape } from 'containers/ConfigsContext' import * as React from 'react' import * as keyHelper from 'utils/keyHelper' -import { SideBarState } from '../../components/SideBarState' +import { SideBarState } from '../../containers/SideBarState' export function useToggleSideBarWithKeyboard( state: SideBarState,