diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 97482cf..3021a74 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -4,9 +4,9 @@ import TagPage from '@/pages/TagPage' import TopNav from '@/components/TopNav' import TagSidebar from '@/components/TagSidebar' import TagDetailSidebar from '@/components/TagDetailSidebar' -import PostPage from '@/pages/PostPage' -import PostNewPage from '@/pages/PostNewPage' -import PostDetailPage from '@/pages/PostDetailPage' +import PostPage from '@/pages/posts/PostPage' +import PostNewPage from '@/pages/posts/PostNewPage' +import PostDetailPage from '@/pages/posts/PostDetailPage' import WikiPage from '@/pages/WikiPage' import WikiNewPage from '@/pages/WikiNewPage' import WikiEditPage from '@/pages/WikiEditPage' diff --git a/frontend/src/components/PostEditForm.tsx b/frontend/src/components/PostEditForm.tsx index e3eb16c..c3e06f5 100644 --- a/frontend/src/components/PostEditForm.tsx +++ b/frontend/src/components/PostEditForm.tsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react' import axios from 'axios' import { API_BASE_URL } from '@/config' +import { Button } from '@/components/ui/button' import type { Post, Tag } from '@/types' @@ -64,9 +65,9 @@ export default ({ post, onSave }: Props) => { {/* 送信 */} - + ) } diff --git a/frontend/src/components/TagDetailSidebar.tsx b/frontend/src/components/TagDetailSidebar.tsx index c14bbb0..e004462 100644 --- a/frontend/src/components/TagDetailSidebar.tsx +++ b/frontend/src/components/TagDetailSidebar.tsx @@ -1,9 +1,11 @@ -import React, { useEffect, useState } from 'react' import axios from 'axios' +import React, { useEffect, useState } from 'react' import { Link, useParams } from 'react-router-dom' + +import TagSearch from '@/components/TagSearch' +import SubsectionTitle from '@/components/common/SubsectionTitle' +import SidebarComponent from '@/components/layout/SidebarComponent' import { API_BASE_URL } from '@/config' -import TagSearch from './TagSearch' -import SidebarComponent from './layout/SidebarComponent' import { CATEGORIES } from '@/consts' import type { Category, Post, Tag } from '@/types' @@ -45,17 +47,16 @@ export default ({ post }: Props) => { {CATEGORIES.map ((cat: Category) => cat in tags && ( - <> -

{categoryNames[cat]}

+
+ {categoryNames[cat]}
    {tags[cat].map (tag => ( -
  • - +
  • + {tag.name}
  • ))}
- ))} +
))}
) } diff --git a/frontend/src/components/TagSearchBox.tsx b/frontend/src/components/TagSearchBox.tsx index 3f5e3c3..0a20031 100644 --- a/frontend/src/components/TagSearchBox.tsx +++ b/frontend/src/components/TagSearchBox.tsx @@ -1,7 +1,8 @@ import React, { useEffect, useState } from 'react' import axios from 'axios' import { Link, useNavigate, useLocation } from 'react-router-dom' -import { API_BASE_URL } from '../config' +import { API_BASE_URL } from '@/config' +import { cn } from '@/lib/utils' import type { Tag } from '@/types' @@ -23,8 +24,10 @@ const TagSearchBox: React.FC = (props: Props) => {