diff --git a/frontend/src/components/TagDetailSidebar.tsx b/frontend/src/components/TagDetailSidebar.tsx index 1362724..a3349e0 100644 --- a/frontend/src/components/TagDetailSidebar.tsx +++ b/frontend/src/components/TagDetailSidebar.tsx @@ -10,9 +10,9 @@ import axios from 'axios' import toCamel from 'camelcase-keys' import { AnimatePresence, motion } from 'framer-motion' import { useEffect, useRef, useState } from 'react' -import { Link } from 'react-router-dom' import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow' +import PrefetchLink from '@/components/PrefetchLink' import TagLink from '@/components/TagLink' import TagSearch from '@/components/TagSearch' import SectionTitle from '@/components/common/SectionTitle' @@ -389,7 +389,7 @@ export default (({ post }: Props) => { )}
  • - 履歴 + 履歴
  • )} diff --git a/frontend/src/components/TagLink.tsx b/frontend/src/components/TagLink.tsx index 9147e45..1952d35 100644 --- a/frontend/src/components/TagLink.tsx +++ b/frontend/src/components/TagLink.tsx @@ -1,6 +1,5 @@ import axios from 'axios' import { useEffect, useState } from 'react' -import { Link } from 'react-router-dom' import PrefetchLink from '@/components/PrefetchLink' import { API_BASE_URL } from '@/config' @@ -18,10 +17,14 @@ type CommonProps = { tag: Tag prefetch?: boolean } type PropsWithLink = - CommonProps & { linkFlg?: true } & Partial> + & CommonProps + & { linkFlg?: true } + & Partial> type PropsWithoutLink = - CommonProps & { linkFlg: false } & Partial> + & CommonProps + & { linkFlg: false } + & Partial> type Props = PropsWithLink | PropsWithoutLink @@ -76,17 +79,17 @@ export default (({ tag, {havingWiki ? ( - ? - ) + ) : ( - ! - )} + )} )} {nestLevel > 0 && ( {tag.name} - : {tag.name} - ) + ) : ( diff --git a/frontend/src/components/TopNavUser.tsx b/frontend/src/components/TopNavUser.tsx index 18a68f3..27008bf 100644 --- a/frontend/src/components/TopNavUser.tsx +++ b/frontend/src/components/TopNavUser.tsx @@ -1,6 +1,5 @@ -import { Link } from 'react-router-dom' - import Separator from '@/components/MenuSeparator' +import PrefetchLink from '@/components/PrefetchLink' import { cn } from '@/lib/utils' import type { FC } from 'react' @@ -24,9 +23,9 @@ export default (({ user, sp }: Props) => { return ( <> {sp && } - {user.name || '名もなきニジラー'} - + ) }) satisfies FC diff --git a/frontend/src/components/WikiBody.tsx b/frontend/src/components/WikiBody.tsx index 0cb5cef..06b81a1 100644 --- a/frontend/src/components/WikiBody.tsx +++ b/frontend/src/components/WikiBody.tsx @@ -2,9 +2,9 @@ import axios from 'axios' import toCamel from 'camelcase-keys' import { useEffect, useMemo, useState } from 'react' import ReactMarkdown from 'react-markdown' -import { Link } from 'react-router-dom' import remarkGFM from 'remark-gfm' +import PrefetchLink from '@/components/PrefetchLink' import SectionTitle from '@/components/common/SectionTitle' import SubsectionTitle from '@/components/common/SubsectionTitle' import { API_BASE_URL } from '@/config' @@ -24,7 +24,7 @@ const mdComponents = { h1: ({ children }) => {children}
      {children}
    , a: (({ href, children }) => ( ['/', '.'].some (e => href?.startsWith (e)) - ? {children} + ? {children} : ( { 耕作履歴 - {id && <>: 投稿 {#{id}}} + {id && <>: 投稿 {#{id}}} @@ -75,12 +76,12 @@ export default (() => { {withPost && ( )} diff --git a/frontend/src/pages/wiki/WikiHistoryPage.tsx b/frontend/src/pages/wiki/WikiHistoryPage.tsx index 000ce43..5c77387 100644 --- a/frontend/src/pages/wiki/WikiHistoryPage.tsx +++ b/frontend/src/pages/wiki/WikiHistoryPage.tsx @@ -2,8 +2,9 @@ import axios from 'axios' import toCamel from 'camelcase-keys' import { useEffect, useState } from 'react' import { Helmet } from 'react-helmet-async' -import { Link, useLocation } from 'react-router-dom' +import { useLocation } from 'react-router-dom' +import PrefetchLink from '@/components/PrefetchLink' import MainArea from '@/components/layout/MainArea' import { API_BASE_URL, SITE_TITLE } from '@/config' @@ -44,22 +45,24 @@ export default () => {
    - + {change.post.title - + @@ -88,9 +89,9 @@ export default (() => { {change.user ? ( - + {change.user.name} - ) : 'bot 操作'} + ) : 'bot 操作'}
    {change.timestamp}
    {change.pred != null && ( - + 差分 - )} + )} - + {change.wikiPage.title} - + {change.pred == null ? '新規' : '更新'} - + {change.user.name} - +
    {change.timestamp}