Futa Arai 5 месяцев назад
Родитель
Сommit
b5262b7ce8
30 измененных файлов с 52 добавлено и 50 удалено
  1. 2 2
      apps/app/src/components/Admin/Common/AdminNavigation.tsx
  2. 1 1
      apps/app/src/components/Common/PagePathHierarchicalLink/PagePathHierarchicalLink.tsx
  3. 3 2
      apps/app/src/components/Common/PagePathNav/PagePathNav.tsx
  4. 1 1
      apps/app/src/components/Common/PagePathNav/PagePathNavLayout.tsx
  5. 2 2
      apps/app/src/components/Common/PagePathNavTitle/PagePathNavTitle.tsx
  6. 5 3
      apps/app/src/components/Layout/AdminLayout.tsx
  7. 4 2
      apps/app/src/components/Layout/BasicLayout.tsx
  8. 3 2
      apps/app/src/components/Layout/NoLoginLayout.tsx
  9. 3 3
      apps/app/src/components/Layout/RawLayout.tsx
  10. 1 1
      apps/app/src/components/Layout/ShareLinkLayout.tsx
  11. 1 1
      apps/app/src/components/PageView/PageAlerts/FixPageGrantAlert.tsx
  12. 1 1
      apps/app/src/components/PageView/PageAlerts/FullTextSearchNotCoverAlert.tsx
  13. 2 2
      apps/app/src/components/PageView/PageAlerts/OldRevisionAlert.tsx
  14. 1 1
      apps/app/src/components/PageView/PageAlerts/PageAlerts.tsx
  15. 1 1
      apps/app/src/components/PageView/PageAlerts/PageGrantAlert.tsx
  16. 1 1
      apps/app/src/components/PageView/PageAlerts/PageRedirectedAlert.tsx
  17. 2 1
      apps/app/src/components/PageView/PageAlerts/PageStaleAlert.tsx
  18. 2 2
      apps/app/src/components/PageView/PageAlerts/TrashPageAlert.tsx
  19. 0 1
      apps/app/src/components/PageView/PageAlerts/WipPageAlert.tsx
  20. 2 2
      apps/app/src/components/PageView/PageContentFooter.tsx
  21. 2 3
      apps/app/src/components/PageView/PageView.tsx
  22. 0 1
      apps/app/src/components/PageView/RevisionRenderer.tsx
  23. 0 1
      apps/app/src/components/ReactMarkdownComponents/CodeBlock.tsx
  24. 2 2
      apps/app/src/components/ReactMarkdownComponents/NextLink.tsx
  25. 2 2
      apps/app/src/components/Script/DrawioViewerScript/DrawioViewerScript.tsx
  26. 1 1
      apps/app/src/components/ShareLinkPageView/ShareLinkAlert.tsx
  27. 2 3
      apps/app/src/components/ShareLinkPageView/ShareLinkPageView.tsx
  28. 1 1
      apps/app/src/components/User/UserDate.jsx
  29. 1 1
      apps/app/src/components/User/UserInfo.tsx
  30. 3 3
      apps/app/src/components/User/Username.tsx

+ 2 - 2
apps/app/src/components/Admin/Common/AdminNavigation.tsx

@@ -1,7 +1,7 @@
-import { pathUtils } from '@growi/core/dist/utils';
+import React, { type JSX, useCallback } from 'react';
 import Link from 'next/link';
+import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
-import React, { type JSX, useCallback } from 'react';
 import urljoin from 'url-join';
 
 import {

+ 1 - 1
apps/app/src/components/Common/PagePathHierarchicalLink/PagePathHierarchicalLink.tsx

@@ -1,5 +1,5 @@
-import Link from 'next/link';
 import React, { type JSX, memo, useCallback } from 'react';
+import Link from 'next/link';
 import urljoin from 'url-join';
 
 import type LinkedPagePath from '~/models/linked-page-path';

+ 3 - 2
apps/app/src/components/Common/PagePathNav/PagePathNav.tsx

@@ -1,14 +1,15 @@
+import { type JSX, useMemo } from 'react';
 import { DevidedPagePath } from '@growi/core/dist/models';
 import { pagePathUtils } from '@growi/core/dist/utils';
-import { type JSX, useMemo } from 'react';
 
 import LinkedPagePath from '~/models/linked-page-path';
 
 import { PagePathHierarchicalLink } from '../PagePathHierarchicalLink';
-import styles from './PagePathNav.module.scss';
 import type { PagePathNavLayoutProps } from './PagePathNavLayout';
 import { PagePathNavLayout } from './PagePathNavLayout';
 
+import styles from './PagePathNav.module.scss';
+
 const { isTrashPage } = pagePathUtils;
 
 const Separator = ({ className }: { className?: string }): JSX.Element => {

+ 1 - 1
apps/app/src/components/Common/PagePathNav/PagePathNavLayout.tsx

@@ -1,5 +1,5 @@
-import dynamic from 'next/dynamic';
 import type { JSX, ReactNode } from 'react';
+import dynamic from 'next/dynamic';
 
 import { useIsNotFound } from '~/stores/page';
 

+ 2 - 2
apps/app/src/components/Common/PagePathNavTitle/PagePathNavTitle.tsx

@@ -1,8 +1,8 @@
+import { type JSX, useState } from 'react';
 import dynamic from 'next/dynamic';
-
 import withLoadingProps from 'next-dynamic-loading-props';
-import { type JSX, useState } from 'react';
 import { useIsomorphicLayoutEffect } from 'usehooks-ts';
+
 import type { PagePathNavLayoutProps } from '../PagePathNav';
 import { PagePathNav } from '../PagePathNav';
 

+ 5 - 3
apps/app/src/components/Layout/AdminLayout.tsx

@@ -1,12 +1,14 @@
-import dynamic from 'next/dynamic';
-import Link from 'next/link';
 import type { JSX, ReactNode } from 'react';
 import React from 'react';
+import dynamic from 'next/dynamic';
+import Link from 'next/link';
 
 import GrowiLogo from '~/components/Common/GrowiLogo';
-import styles from './Admin.module.scss';
+
 import { RawLayout } from './RawLayout';
 
+import styles from './Admin.module.scss';
+
 const AdminNavigation = dynamic(
   () =>
     import('../Admin/Common/AdminNavigation').then(

+ 4 - 2
apps/app/src/components/Layout/BasicLayout.tsx

@@ -1,9 +1,11 @@
-import dynamic from 'next/dynamic';
 import type { JSX, ReactNode } from 'react';
 import React from 'react';
-import styles from './BasicLayout.module.scss';
+import dynamic from 'next/dynamic';
+
 import { RawLayout } from './RawLayout';
 
+import styles from './BasicLayout.module.scss';
+
 const AiAssistantSidebar = dynamic(
   () =>
     import(

+ 3 - 2
apps/app/src/components/Layout/NoLoginLayout.tsx

@@ -1,13 +1,14 @@
-import Image from 'next/image';
 import type { JSX, ReactNode } from 'react';
 import React from 'react';
+import Image from 'next/image';
 
 import { useAppTitle } from '~/stores-universal/context';
 
 import GrowiLogo from '../Common/GrowiLogo';
-import commonStyles from './NoLoginLayout.module.scss';
 import { RawLayout } from './RawLayout';
 
+import commonStyles from './NoLoginLayout.module.scss';
+
 type Props = {
   className?: string;
   children?: ReactNode;

+ 3 - 3
apps/app/src/components/Layout/RawLayout.tsx

@@ -1,8 +1,8 @@
-import type { ColorScheme } from '@growi/core';
-import dynamic from 'next/dynamic';
-import Head from 'next/head';
 import type { JSX, ReactNode } from 'react';
 import React, { useState } from 'react';
+import dynamic from 'next/dynamic';
+import Head from 'next/head';
+import type { ColorScheme } from '@growi/core';
 import { useIsomorphicLayoutEffect } from 'usehooks-ts';
 
 import {

+ 1 - 1
apps/app/src/components/Layout/ShareLinkLayout.tsx

@@ -1,6 +1,6 @@
-import dynamic from 'next/dynamic';
 import type { JSX, ReactNode } from 'react';
 import React from 'react';
+import dynamic from 'next/dynamic';
 
 import { RawLayout } from './RawLayout';
 

+ 1 - 1
apps/app/src/components/PageView/PageAlerts/FixPageGrantAlert.tsx

@@ -1,5 +1,5 @@
-import { GroupType, PageGrant } from '@growi/core';
 import React, { type JSX, useCallback, useEffect, useState } from 'react';
+import { GroupType, PageGrant } from '@growi/core';
 import { useTranslation } from 'react-i18next';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
 

+ 1 - 1
apps/app/src/components/PageView/PageAlerts/FullTextSearchNotCoverAlert.tsx

@@ -1,6 +1,6 @@
 import type { JSX } from 'react';
-
 import { useTranslation } from 'react-i18next';
+
 import { useSWRxCurrentPage } from '~/stores/page';
 import { useElasticsearchMaxBodyLengthToIndex } from '~/stores-universal/context';
 

+ 2 - 2
apps/app/src/components/PageView/PageAlerts/OldRevisionAlert.tsx

@@ -1,6 +1,6 @@
-import { returnPathForURL } from '@growi/core/dist/utils/path-utils';
-import { useRouter } from 'next/router';
 import React, { type JSX, useCallback } from 'react';
+import { useRouter } from 'next/router';
+import { returnPathForURL } from '@growi/core/dist/utils/path-utils';
 import { useTranslation } from 'react-i18next';
 
 import {

+ 1 - 1
apps/app/src/components/PageView/PageAlerts/PageAlerts.tsx

@@ -1,5 +1,5 @@
-import dynamic from 'next/dynamic';
 import type { JSX } from 'react';
+import dynamic from 'next/dynamic';
 
 import { useIsNotFound } from '~/stores/page';
 

+ 1 - 1
apps/app/src/components/PageView/PageAlerts/PageGrantAlert.tsx

@@ -1,5 +1,5 @@
-import { isPopulated } from '@growi/core';
 import React, { type JSX } from 'react';
+import { isPopulated } from '@growi/core';
 import { useTranslation } from 'react-i18next';
 
 import { useSWRxCurrentPage } from '~/stores/page';

+ 1 - 1
apps/app/src/components/PageView/PageAlerts/PageRedirectedAlert.tsx

@@ -1,5 +1,5 @@
-import { useTranslation } from 'next-i18next';
 import React, { type JSX, useCallback, useState } from 'react';
+import { useTranslation } from 'next-i18next';
 
 import { useCurrentPagePath } from '~/stores/page';
 import { useRedirectFrom } from '~/stores/page-redirect';

+ 2 - 1
apps/app/src/components/PageView/PageAlerts/PageStaleAlert.tsx

@@ -1,6 +1,7 @@
+import type { JSX } from 'react';
 import { isIPageInfoForEntity } from '@growi/core';
 import { useTranslation } from 'next-i18next';
-import type { JSX } from 'react';
+
 import { useSWRxCurrentPage, useSWRxPageInfo } from '~/stores/page';
 import { useIsEnabledStaleNotification } from '~/stores-universal/context';
 

+ 2 - 2
apps/app/src/components/PageView/PageAlerts/TrashPageAlert.tsx

@@ -1,7 +1,7 @@
+import React, { type JSX, useCallback } from 'react';
+import { useRouter } from 'next/router';
 import { UserPicture } from '@growi/ui/dist/components';
 import { format } from 'date-fns/format';
-import { useRouter } from 'next/router';
-import React, { type JSX, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { usePageDeleteModal, usePutBackPageModal } from '~/stores/modal';

+ 0 - 1
apps/app/src/components/PageView/PageAlerts/WipPageAlert.tsx

@@ -1,5 +1,4 @@
 import React, { type JSX, useCallback } from 'react';
-
 import { useTranslation } from 'react-i18next';
 
 import { useSWRMUTxCurrentPage, useSWRxCurrentPage } from '~/stores/page';

+ 2 - 2
apps/app/src/components/PageView/PageContentFooter.tsx

@@ -1,6 +1,6 @@
-import type { IPage, IPagePopulatedToShowRevision } from '@growi/core';
-import dynamic from 'next/dynamic';
 import type { JSX } from 'react';
+import dynamic from 'next/dynamic';
+import type { IPage, IPagePopulatedToShowRevision } from '@growi/core';
 
 import styles from './PageContentFooter.module.scss';
 

+ 2 - 3
apps/app/src/components/PageView/PageView.tsx

@@ -1,8 +1,8 @@
+import React, { type JSX, useEffect, useMemo, useRef, useState } from 'react';
+import dynamic from 'next/dynamic';
 import type { IPagePopulatedToShowRevision } from '@growi/core';
 import { isUsersHomepage } from '@growi/core/dist/utils/page-path-utils';
 import { useSlidesByFrontmatter } from '@growi/presentation/dist/services';
-import dynamic from 'next/dynamic';
-import React, { type JSX, useEffect, useMemo, useRef, useState } from 'react';
 
 import { PagePathNavTitle } from '~/components/Common/PagePathNavTitle';
 import type { RendererConfig } from '~/interfaces/services/renderer';
@@ -17,7 +17,6 @@ import {
 } from '~/stores-universal/context';
 
 import { UserInfo } from '../User/UserInfo';
-
 import { PageAlerts } from './PageAlerts/PageAlerts';
 import { PageContentFooter } from './PageContentFooter';
 import { PageViewLayout } from './PageViewLayout';

+ 0 - 1
apps/app/src/components/PageView/RevisionRenderer.tsx

@@ -1,5 +1,4 @@
 import React, { type JSX } from 'react';
-
 import type { FallbackProps } from 'react-error-boundary';
 import { ErrorBoundary } from 'react-error-boundary';
 import ReactMarkdown from 'react-markdown';

+ 0 - 1
apps/app/src/components/ReactMarkdownComponents/CodeBlock.tsx

@@ -1,5 +1,4 @@
 import type { JSX, ReactNode } from 'react';
-
 import { PrismAsyncLight } from 'react-syntax-highlighter';
 import { oneDark } from 'react-syntax-highlighter/dist/cjs/styles/prism';
 

+ 2 - 2
apps/app/src/components/ReactMarkdownComponents/NextLink.tsx

@@ -1,7 +1,7 @@
-import { pagePathUtils } from '@growi/core/dist/utils';
+import type { JSX } from 'react';
 import type { LinkProps } from 'next/link';
 import Link from 'next/link';
-import type { JSX } from 'react';
+import { pagePathUtils } from '@growi/core/dist/utils';
 
 import { useSiteUrl } from '~/stores-universal/context';
 import loggerFactory from '~/utils/logger';

+ 2 - 2
apps/app/src/components/Script/DrawioViewerScript/DrawioViewerScript.tsx

@@ -1,6 +1,6 @@
-import type { IGraphViewerGlobal } from '@growi/remark-drawio';
-import Head from 'next/head';
 import { type JSX, useCallback } from 'react';
+import Head from 'next/head';
+import type { IGraphViewerGlobal } from '@growi/remark-drawio';
 
 import { useViewerMinJsUrl } from './use-viewer-min-js-url';
 

+ 1 - 1
apps/app/src/components/ShareLinkPageView/ShareLinkAlert.tsx

@@ -1,6 +1,6 @@
-import { useTranslation } from 'next-i18next';
 import type { FC } from 'react';
 import React from 'react';
+import { useTranslation } from 'next-i18next';
 
 const generateRatio = (expiredAt: Date, createdAt: Date): number => {
   const wholeTime =

+ 2 - 3
apps/app/src/components/ShareLinkPageView/ShareLinkPageView.tsx

@@ -1,7 +1,7 @@
+import { type JSX, useMemo } from 'react';
+import dynamic from 'next/dynamic';
 import type { IPagePopulatedToShowRevision } from '@growi/core';
 import { useSlidesByFrontmatter } from '@growi/presentation/dist/services';
-import dynamic from 'next/dynamic';
-import { type JSX, useMemo } from 'react';
 
 import { PagePathNavTitle } from '~/components/Common/PagePathNavTitle';
 import type { RendererConfig } from '~/interfaces/services/renderer';
@@ -15,7 +15,6 @@ import loggerFactory from '~/utils/logger';
 import { PageContentFooter } from '../PageView/PageContentFooter';
 import { PageViewLayout } from '../PageView/PageViewLayout';
 import RevisionRenderer from '../PageView/RevisionRenderer';
-
 import ShareLinkAlert from './ShareLinkAlert';
 
 const logger = loggerFactory('growi:Page');

+ 1 - 1
apps/app/src/components/User/UserDate.jsx

@@ -1,6 +1,6 @@
+import React from 'react';
 import { format } from 'date-fns/format';
 import PropTypes from 'prop-types';
-import React from 'react';
 
 /**
  * UserDate

+ 1 - 1
apps/app/src/components/User/UserInfo.tsx

@@ -1,6 +1,6 @@
+import React, { type JSX } from 'react';
 import type { IUserHasId } from '@growi/core';
 import { UserPicture } from '@growi/ui/dist/components';
-import React, { type JSX } from 'react';
 
 import styles from './UserInfo.module.scss';
 

+ 3 - 3
apps/app/src/components/User/Username.tsx

@@ -1,9 +1,9 @@
+import type React from 'react';
+import type { JSX } from 'react';
+import Link from 'next/link';
 import type { IUserHasId } from '@growi/core';
 import { type IUser, isPopulated, type Ref } from '@growi/core';
 import { pagePathUtils } from '@growi/core/dist/utils';
-import Link from 'next/link';
-import type React from 'react';
-import type { JSX } from 'react';
 
 export const Username: React.FC<{ user?: IUserHasId | Ref<IUser> }> = ({
   user,