Merge branch 'subwork' into mainwork
This commit is contained in:
@@ -2,6 +2,7 @@ import { PostList } from "@/app/components/PostList";
|
||||
import { HeroBanner } from "@/app/components/HeroBanner";
|
||||
import { BoardToolbar } from "@/app/components/BoardToolbar";
|
||||
import { headers } from "next/headers";
|
||||
import prisma from "@/lib/prisma";
|
||||
|
||||
// Next 15: params/searchParams가 Promise가 될 수 있어 안전 언랩 처리합니다.
|
||||
export default async function BoardDetail({ params, searchParams }: { params: any; searchParams: any }) {
|
||||
@@ -9,6 +10,7 @@ export default async function BoardDetail({ params, searchParams }: { params: an
|
||||
const sp = searchParams?.then ? await searchParams : searchParams;
|
||||
const idOrSlug = p.id as string;
|
||||
const sort = (sp?.sort as "recent" | "popular" | undefined) ?? "recent";
|
||||
const period = (sp?.period as string | undefined) ?? "monthly";
|
||||
// 보드 slug 조회 (새 글 페이지 프리셋 전달)
|
||||
const h = await headers();
|
||||
const host = h.get("host") ?? "localhost:3000";
|
||||
@@ -20,6 +22,21 @@ export default async function BoardDetail({ params, searchParams }: { params: an
|
||||
const id = board?.id as string;
|
||||
const siblingBoards = (boards || []).filter((b: any) => b.category?.id && b.category.id === board?.category?.id);
|
||||
const categoryName = board?.category?.name ?? "";
|
||||
|
||||
// 리스트 뷰 타입 확인 (특수랭킹일 경우 게시글 대신 랭킹 노출)
|
||||
const boardView = await prisma.board.findUnique({
|
||||
where: { id },
|
||||
select: { listViewType: { select: { key: true } } },
|
||||
});
|
||||
const isSpecialRanking = boardView?.listViewType?.key === "list_special_rank";
|
||||
|
||||
let rankingItems: { userId: string; nickname: string; points: number }[] = [];
|
||||
if (isSpecialRanking) {
|
||||
const rankingUrl = new URL(`/api/ranking?period=${encodeURIComponent(period)}`, base).toString();
|
||||
const rankingRes = await fetch(rankingUrl, { cache: "no-store" });
|
||||
const rankingData = await rankingRes.json().catch(() => ({ items: [] }));
|
||||
rankingItems = rankingData?.items ?? [];
|
||||
}
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
{/* 상단 배너 (서브카테고리 표시) */}
|
||||
@@ -34,12 +51,40 @@ export default async function BoardDetail({ params, searchParams }: { params: an
|
||||
<section>
|
||||
<BoardToolbar boardId={board?.slug} />
|
||||
<div className="p-0">
|
||||
<PostList
|
||||
boardId={id}
|
||||
sort={sort}
|
||||
variant="board"
|
||||
newPostHref={`/posts/new?boardId=${id}${board?.slug ? `&boardSlug=${board.slug}` : ""}`}
|
||||
/>
|
||||
{isSpecialRanking ? (
|
||||
<div className="rounded-xl border border-neutral-200 overflow-hidden">
|
||||
<div className="px-4 py-3 border-b border-neutral-200 flex items-center justify-between bg-[#f6f4f4]">
|
||||
<h2 className="text-sm text-neutral-700">포인트 랭킹 ({period})</h2>
|
||||
<div className="text-xs text-neutral-500 flex gap-2">
|
||||
<a href={`?period=daily`} className={`px-2 py-0.5 rounded ${period === "daily" ? "bg-neutral-900 text-white" : "bg-white border border-neutral-300"}`}>일간</a>
|
||||
<a href={`?period=weekly`} className={`px-2 py-0.5 rounded ${period === "weekly" ? "bg-neutral-900 text-white" : "bg-white border border-neutral-300"}`}>주간</a>
|
||||
<a href={`?period=monthly`} className={`px-2 py-0.5 rounded ${period === "monthly" ? "bg-neutral-900 text-white" : "bg-white border border-neutral-300"}`}>월간</a>
|
||||
<a href={`?period=all`} className={`px-2 py-0.5 rounded ${period === "all" ? "bg-neutral-900 text-white" : "bg-white border border-neutral-300"}`}>전체</a>
|
||||
</div>
|
||||
</div>
|
||||
<ol className="divide-y divide-neutral-200">
|
||||
{rankingItems.map((i, idx) => (
|
||||
<li key={i.userId} className="px-4 py-3 flex items-center justify-between">
|
||||
<div className="flex items-center gap-3 min-w-0">
|
||||
<span className="inline-flex items-center justify-center w-6 h-6 rounded-full bg-neutral-900 text-white text-xs">{idx + 1}</span>
|
||||
<span className="truncate text-neutral-900 font-medium">{i.nickname || "회원"}</span>
|
||||
</div>
|
||||
<div className="shrink-0 text-sm text-neutral-700">{i.points}점</div>
|
||||
</li>
|
||||
))}
|
||||
{rankingItems.length === 0 && (
|
||||
<li className="px-4 py-10 text-center text-neutral-500">랭킹 데이터가 없습니다.</li>
|
||||
)}
|
||||
</ol>
|
||||
</div>
|
||||
) : (
|
||||
<PostList
|
||||
boardId={id}
|
||||
sort={sort}
|
||||
variant="board"
|
||||
newPostHref={`/posts/new?boardId=${id}${board?.slug ? `&boardSlug=${board.slug}` : ""}`}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user