Просмотр исходного кода

relocate modules and fix import

WNomunomu 2 лет назад
Родитель
Сommit
572ae9d323

+ 2 - 2
apps/app/src/components/ItemsTree/ItemsTree.tsx

@@ -27,7 +27,7 @@ import loggerFactory from '~/utils/logger';
 
 import { ItemNode, SimpleItemProps } from '../TreeItem';
 
-import PageTreeContentSkeleton from './PageTreeContentSkeleton';
+import ItemsTreeContentSkeleton from './ItemsTreeContentSkeleton';
 
 import styles from './ItemsTree.module.scss';
 
@@ -287,5 +287,5 @@ export const ItemsTree = (props: ItemsTreeProps): JSX.Element => {
     );
   }
 
-  return <PageTreeContentSkeleton />;
+  return <ItemsTreeContentSkeleton />;
 };

+ 2 - 2
apps/app/src/components/ItemsTree/PageTreeContentSkeleton.tsx → apps/app/src/components/ItemsTree/ItemsTreeContentSkeleton.tsx

@@ -4,7 +4,7 @@ import { Skeleton } from '~/components/Skeleton';
 
 import styles from './ItemsTree.module.scss';
 
-const PageTreeContentSkeleton = (): JSX.Element => {
+const ItemsTreeContentSkeleton = (): JSX.Element => {
 
   return (
     <ul className={`grw-pagetree ${styles['grw-pagetree']} list-group py-3`}>
@@ -15,4 +15,4 @@ const PageTreeContentSkeleton = (): JSX.Element => {
   );
 };
 
-export default PageTreeContentSkeleton;
+export default ItemsTreeContentSkeleton;

+ 2 - 2
apps/app/src/components/ItemsTree/index.ts

@@ -1,4 +1,4 @@
-export * from './PageTree';
+export * from '../Sidebar/PageTree/PageTree';
 export { ItemNode } from './ItemNode';
-export * from './PrivateLegacyPagesLink';
+export * from '../Sidebar/PageTree/PrivateLegacyPagesLink';
 export * from './ItemsTree';

+ 3 - 3
apps/app/src/components/ItemsTree/PageTree.tsx → apps/app/src/components/Sidebar/PageTree/PageTree.tsx

@@ -3,12 +3,12 @@ import { Suspense } from 'react';
 import dynamic from 'next/dynamic';
 import { useTranslation } from 'react-i18next';
 
-import PageTreeContentSkeleton from './PageTreeContentSkeleton';
+import ItemsTreeContentSkeleton from '../../ItemsTree/ItemsTreeContentSkeleton';
 import { PageTreeHeader } from './PageTreeSubstance';
 
 const PageTreeContent = dynamic(
   () => import('./PageTreeSubstance').then(mod => mod.PageTreeContent),
-  { ssr: false, loading: PageTreeContentSkeleton },
+  { ssr: false, loading: ItemsTreeContentSkeleton },
 );
 
 
@@ -24,7 +24,7 @@ export const PageTree = (): JSX.Element => {
         </Suspense>
       </div>
 
-      <Suspense fallback={<PageTreeContentSkeleton />}>
+      <Suspense fallback={<ItemsTreeContentSkeleton />}>
         <PageTreeContent />
       </Suspense>
     </div>

+ 3 - 3
apps/app/src/components/ItemsTree/PageTreeSubstance.tsx → apps/app/src/components/Sidebar/PageTree/PageTreeSubstance.tsx

@@ -6,10 +6,10 @@ import { useTargetAndAncestors, useIsGuestUser, useIsReadOnlyUser } from '~/stor
 import { useCurrentPagePath, useCurrentPageId } from '~/stores/page';
 import { mutatePageTree, useSWRxRootPage, useSWRxV5MigrationStatus } from '~/stores/page-listing';
 
-import { PageTreeItem } from '../Sidebar/PageTreeItem/PageTreeItem';
-import { SidebarHeaderReloadButton } from '../Sidebar/SidebarHeaderReloadButton';
+import { PageTreeItem } from '../PageTreeItem/PageTreeItem';
+import { SidebarHeaderReloadButton } from '../SidebarHeaderReloadButton';
 
-import { ItemsTree } from './ItemsTree';
+import { ItemsTree } from '../../ItemsTree/ItemsTree';
 import { PrivateLegacyPagesLink } from './PrivateLegacyPagesLink';
 
 

+ 0 - 0
apps/app/src/components/ItemsTree/PrivateLegacyPagesLink.tsx → apps/app/src/components/Sidebar/PageTree/PrivateLegacyPagesLink.tsx