중간

2025-11-07 23:41:52 +09:00
parent ab81a3da3d
commit bb71b892ca
16 changed files with 245 additions and 113 deletions
--- a/src/app/api/admin/partner-shops/[id]/route.ts
+++ b/src/app/api/admin/partner-shops/[id]/route.ts
@@ -8,13 +8,13 @@ export async function PATCH(req: Request, context: { params: Promise<{ id: strin
  for (const k of ["region", "name", "address", "imageUrl", "active", "sortOrder"]) {
    if (k in body) data[k] = body[k];
  }
-  const item = await prisma.partnerShop.update({ where: { id }, data });
+  const item = await prisma.partnerRequest.update({ where: { id }, data });
  return NextResponse.json({ item });
 }

 export async function DELETE(_: Request, context: { params: Promise<{ id: string }> }) {
  const { id } = await context.params;
-  await prisma.partnerShop.delete({ where: { id } });
+  await prisma.partnerRequest.delete({ where: { id } });
  return NextResponse.json({ ok: true });
 }

--- a/src/app/api/admin/partner-shops/route.ts
+++ b/src/app/api/admin/partner-shops/route.ts
@@ -4,8 +4,12 @@ import { z } from "zod";
 import type { Prisma } from "@prisma/client";

 export async function GET() {
-  const items = await prisma.partnerShop.findMany({ orderBy: [{ active: "desc" }, { sortOrder: "asc" }, { createdAt: "desc" }] });
-  return NextResponse.json({ items });
+  const rows = await prisma.partnerRequest.findMany({
+    where: { status: "approved" },
+    orderBy: [{ active: "desc" }, { sortOrder: "asc" }, { createdAt: "desc" }],
+    select: { id: true, region: true, name: true, address: true, imageUrl: true, sortOrder: true, active: true },
+  });
+  return NextResponse.json({ items: rows });
 }

 const createSchema = z.object({
@@ -21,7 +25,8 @@ export async function POST(req: Request) {
  const body = await req.json().catch(() => ({}));
  const parsed = createSchema.safeParse(body);
  if (!parsed.success) return NextResponse.json({ error: parsed.error.flatten() }, { status: 400 });
-  const item = await prisma.partnerShop.create({ data: parsed.data as Prisma.PartnerShopCreateInput });
+  // 통합: 승인된 레코드로 등록
+  const item = await prisma.partnerRequest.create({ data: { ...(parsed.data as any), status: "approved" } });
  return NextResponse.json({ item }, { status: 201 });
 }

--- a/src/app/api/partner-shops/route.ts
+++ b/src/app/api/partner-shops/route.ts
@@ -2,10 +2,13 @@ import { NextResponse } from "next/server";
 import prisma from "@/lib/prisma";

 export async function GET() {
-  const items = await prisma.partnerShop.findMany({
-    where: { active: true },
+  // 통합: 승인된 파트너 요청을 메인 노출용으로 사용
+  const rows = await prisma.partnerRequest.findMany({
+    where: { status: "approved", active: true },
    orderBy: [{ sortOrder: "asc" }, { createdAt: "desc" }],
+    select: { id: true, region: true, name: true, address: true, imageUrl: true, sortOrder: true, active: true, category: true },
  });
+  const items = rows.map((r) => ({ id: r.id, region: r.region || "", name: r.name, address: r.address || "", imageUrl: r.imageUrl || "", sortOrder: r.sortOrder, active: r.active, category: r.category }));
  return NextResponse.json({ items });
 }

--- a/src/app/api/partners/route.ts
+++ b/src/app/api/partners/route.ts
@@ -1,32 +1,24 @@
 import { NextResponse } from "next/server";
 import prisma from "@/lib/prisma";

-function haversine(lat1: number, lon1: number, lat2: number, lon2: number) {
-  const toRad = (v: number) => (v * Math.PI) / 180;
-  const R = 6371; // km
-  const dLat = toRad(lat2 - lat1);
-  const dLon = toRad(lon2 - lon1);
-  const a = Math.sin(dLat / 2) ** 2 + Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) * Math.sin(dLon / 2) ** 2;
-  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-  return R * c;
-}
-
 export async function GET(req: Request) {
  const { searchParams } = new URL(req.url);
-  const lat = Number(searchParams.get("lat"));
-  const lon = Number(searchParams.get("lon"));
  const category = searchParams.get("category") || undefined;
  const categoryId = searchParams.get("categoryId") || undefined;
-  const radius = Number(searchParams.get("radius")) || 10; // km
-  const where: any = categoryId
-    ? { categoryId }
-    : (category ? { category } : {});
+  let where: any = {};
+  if (categoryId) {
+    // 카테고리 ID 매칭 + 과거 데이터 호환(문자열 category명 매칭)
+    let catName: string | undefined;
+    try {
+      const cat = await prisma.partnerCategory.findUnique({ where: { id: categoryId }, select: { name: true } });
+      catName = cat?.name;
+    } catch {}
+    where = catName ? { OR: [{ categoryId }, { category: catName }] } : { categoryId };
+  } else if (category) {
+    where = { category };
+  }
  const partners = await prisma.partner.findMany({ where, orderBy: { createdAt: "desc" } });
-  const withDistance = isFinite(lat) && isFinite(lon)
-    ? partners.map((p) => ({ ...p, distance: haversine(lat, lon, p.latitude, p.longitude) })).filter((p) => p.distance <= radius)
-    : partners.map((p) => ({ ...p, distance: null }));
-  withDistance.sort((a, b) => (a.distance ?? 0) - (b.distance ?? 0));
-  return NextResponse.json({ partners: withDistance });
+  return NextResponse.json({ partners });
 }


--- a/src/app/api/posts/route.ts
+++ b/src/app/api/posts/route.ts
@@ -48,7 +48,7 @@ const listQuerySchema = z.object({
  pageSize: z.coerce.number().min(1).max(100).default(10),
  boardId: z.string().optional(),
  q: z.string().optional(),
-  sort: z.enum(["recent", "popular"]).default("recent").optional(),
+  sort: z.enum(["recent", "popular", "views", "likes", "comments"]).default("recent").optional(),
  tag: z.string().optional(), // Tag.slug
  author: z.string().optional(), // User.nickname contains
  authorId: z.string().optional(), // User.userId exact match
@@ -103,8 +103,12 @@ export async function GET(req: Request) {
    prisma.post.findMany({
      where,
      orderBy:
-        sort === "popular"
+        sort === "popular" || sort === "likes"
          ? [{ isPinned: "desc" }, { stat: { recommendCount: "desc" } }, { createdAt: "desc" }]
+          : sort === "views"
+          ? [{ isPinned: "desc" }, { stat: { views: "desc" } }, { createdAt: "desc" }]
+          : sort === "comments"
+          ? [{ isPinned: "desc" }, { stat: { commentsCount: "desc" } }, { createdAt: "desc" }]
          : [{ isPinned: "desc" }, { createdAt: "desc" }],
      skip: (page - 1) * pageSize,
      take: pageSize,
--- a/src/app/boards/[id]/page.tsx
+++ b/src/app/boards/[id]/page.tsx
@@ -15,7 +15,7 @@ export default async function BoardDetail({ params, searchParams }: { params: an
  const p = params?.then ? await params : params;
  const sp = searchParams?.then ? await searchParams : searchParams;
  const idOrSlug = p.id as string;
-  const sort = (sp?.sort as "recent" | "popular" | undefined) ?? "recent";
+  const sort = (sp?.sort as "recent" | "popular" | "views" | "likes" | "comments" | undefined) ?? "recent";
  // 보드 slug 조회 (새 글 페이지 프리셋 전달)
  const h = await headers();
  const host = h.get("host") ?? "localhost:3000";
@@ -70,8 +70,8 @@ export default async function BoardDetail({ params, searchParams }: { params: an
                  href={`/boards/${b.slug}`}
                  className={
                    b.id === id
-                      ? "px-3 h-[28px] rounded-full bg-[#F94B37] text-white text-[12px] leading-[28px] whitespace-nowrap"
-                      : "px-3 h-[28px] rounded-full bg-transparent text-white/85 hover:text-white border border-white/30 text-[12px] leading-[28px] whitespace-nowrap"
+                      ? "px-3 h-[28px] mt-[11px] rounded-full bg-[#F94B37] text-white text-[12px] font-[700] leading-[28px] whitespace-nowrap"
+                      : "px-3 h-[28px] rounded-full bg-transparent text-white/85 hover:text-white border border-white/30 text-[12px] font-[700] leading-[28px] whitespace-nowrap"
                  }
                >
                  {b.name}
--- a/src/app/components/BoardToolbar.tsx
+++ b/src/app/components/BoardToolbar.tsx
@@ -60,13 +60,9 @@ export function BoardToolbar({ boardId }: { boardId: string }) {
      <div className="order-2 md:order-1 flex items-center gap-2">
        <select aria-label="정렬" className="h-8 px-2 rounded-md border border-neutral-300 bg-white text-sm" defaultValue={sort} onChange={onChangeSort}>
          <option value="recent">최신순</option>
-          <option value="popular">인기순</option>
-        </select>
-        <select aria-label="기간" className="h-8 px-2 rounded-md border border-neutral-300 bg-white text-sm" defaultValue={period} onChange={onChangePeriod}>
-          <option value="all">전체기간</option>
-          <option value="1d">24시간</option>
-          <option value="1w">1주일</option>
-          <option value="1m">1개월</option>
+          <option value="views">조회순</option>
+          <option value="likes">좋아요순</option>
+          <option value="comments">댓글순</option>
        </select>
      </div>
    </div>
--- a/src/app/components/HeroBanner.tsx
+++ b/src/app/components/HeroBanner.tsx
@@ -10,7 +10,38 @@ type SubItem = { id: string; name: string; href: string };

 const fetcher = (url: string) => fetch(url).then((r) => r.json());

-export function HeroBanner({ subItems, activeSubId, hideSubOnMobile }: { subItems?: SubItem[]; activeSubId?: string; hideSubOnMobile?: boolean }) {
+export function HeroBanner({ subItems, activeSubId, hideSubOnMobile, showPartnerCats }: { subItems?: SubItem[]; activeSubId?: string; hideSubOnMobile?: boolean; showPartnerCats?: boolean }) {
+  const usePartnerCats = ((!Array.isArray(subItems) || subItems.length === 0) && showPartnerCats !== false);
+  // 파트너 카테고리 불러오기 (홈 배너 하단 블랙바에 표시)
+  const { data: catData } = useSWR<{ categories: any[] }>(usePartnerCats ? "/api/partner-categories" : null, fetcher, { revalidateOnFocus: false, dedupingInterval: 5 * 60 * 1000 });
+  const categories = catData?.categories ?? [];
+  const [selectedCatId, setSelectedCatId] = useState<string>("");
+  useEffect(() => {
+    if (!usePartnerCats) return;
+    if (!selectedCatId && categories.length > 0) {
+      let id = "";
+      try {
+        id = (window as any).__partnerCategoryId || localStorage.getItem("selectedPartnerCategoryId") || "";
+      } catch {}
+      if (!id) id = categories[0].id;
+      setSelectedCatId(id);
+      try {
+        (window as any).__partnerCategoryId = id;
+        localStorage.setItem("selectedPartnerCategoryId", id);
+        window.dispatchEvent(new CustomEvent("partnerCategorySelect", { detail: { id } }));
+      } catch {}
+    }
+  }, [usePartnerCats, categories, selectedCatId]);
+  const onSelectCategory = useCallback((id: string) => {
+    if (!usePartnerCats) return;
+    setSelectedCatId(id);
+    // 전역 이벤트로 선택 전달
+    try {
+      (window as any).__partnerCategoryId = id;
+      localStorage.setItem("selectedPartnerCategoryId", id);
+      window.dispatchEvent(new CustomEvent("partnerCategorySelect", { detail: { id } }));
+    } catch {}
+  }, [usePartnerCats]);
  // SWR 캐시 사용: 페이지 전환 시 재요청/깜빡임 최소화
  const { data } = useSWR<{ banners: Banner[] }>("/api/banners", fetcher, {
    revalidateOnFocus: false,
@@ -78,23 +109,46 @@ export function HeroBanner({ subItems, activeSubId, hideSubOnMobile }: { subItem
      <section className="relative w-full overflow-hidden rounded-xl bg-neutral-900 text-white" aria-roledescription="carousel">
        <SelectedBanner className="h-56 sm:h-72 md:h-[264px]" />
        {/* 분리된 하단 블랙 바: 높이 58px, 중앙 서브카테고리 (스켈레톤 상태에서도 동일 레이아웃 유지) */}
-        <div className={`${hideSubOnMobile ? "hidden md:flex" : "flex"} h-[58px] bg-black rounded-xl items-center justify-center px-2`}>
-          {Array.isArray(subItems) && subItems.length > 0 && (
-            <div className="flex flex-wrap items-center gap-[8px]">
-              {subItems.map((s) => (
-                <Link
-                  key={s.id}
-                  href={s.href}
+        <div className={`${hideSubOnMobile ? "hidden md:flex" : "flex"} h-[58px] bg-black rounded-xl items-end justify-center px-2`}>
+          {usePartnerCats ? (
+            <div className="flex flex-wrap items-center h-[74%] gap-[24px]">
+              {categories.map((c: any) => (
+                <button
+                  key={c.id}
+                  onClick={() => onSelectCategory(c.id)}
                  className={
-                    s.id === activeSubId
-                      ? "px-3 h-[28px] rounded-full bg-[#F94B37] text-white text-[12px] leading-[28px] whitespace-nowrap"
-                      : "px-3 h-[28px] rounded-full bg-transparent text-white/85 hover:bg-[#F94B37] hover:text-white text-[12px] leading-[28px] whitespace-nowrap"
+                    (selectedCatId || categories[0]?.id) === c.id
+                      ? "px-3 h-full inline-flex items-center bg-white text-[#d73b29] text-[20px] font-[700] rounded-tl-[14px] rounded-tr-[14px] whitespace-nowrap"
+                      : "px-3 h-full inline-flex items-center bg-transparent text-[#d5d5d5] hover:bg-white hover:text-[#d73b29] hover:font-[700] hover:rounded-tl-[14px] hover:rounded-tr-[14px] text-[20px] font-[500] whitespace-nowrap"
                  }
                >
-                  {s.name}
-                </Link>
+                  {c.name}
+                </button>
              ))}
            </div>
+          ) : (
+            Array.isArray(subItems) && subItems.length > 0 && (
+              <div className="flex flex-wrap items-center h-[74%] gap-[24px]">
+                {subItems.map((s) => (
+                  <Link
+                    key={s.id}
+                    href={s.href}
+                    className={
+                      s.id === activeSubId
+                        ? "px-3 h-full inline-flex items-center bg-white text-[#d73b29] text-[20px] font-[700] rounded-tl-[14px] rounded-tr-[14px] whitespace-nowrap"
+                        : "px-3 h-full inline-flex items-center bg-transparent text-[#d5d5d5] hover:bg-white hover:text-[#d73b29] hover:font-[700] hover:rounded-tl-[14px] hover:rounded-tr-[14px] text-[20px] font-[500] whitespace-nowrap"
+                    }
+                  >
+                    {s.name}
+                  </Link>
+                ))}
+              </div>
+            )
+          )}
+          {!usePartnerCats && (!Array.isArray(subItems) || subItems.length === 0) && (
+            <div className="flex items-center gap-[8px]">
+              <span className="px-3 h-[28px] rounded-full bg-transparent text-white/85 text-[12px] leading-[28px] whitespace-nowrap cursor-default">암실소문</span>
+            </div>
          )}
        </div>
      </section>
@@ -177,23 +231,46 @@ export function HeroBanner({ subItems, activeSubId, hideSubOnMobile }: { subItem
      </div>

      {/* 분리된 하단 블랙 바: 높이 58px, 중앙 서브카테고리 */}
-      <div className={`${hideSubOnMobile ? "hidden md:flex" : "flex"} h-[58px] bg-black rounded-xl items-center justify-center px-2`}>
-        {Array.isArray(subItems) && subItems.length > 0 && (
-          <div className="flex flex-wrap items-center gap-[8px]">
-              {subItems.map((s) => (
-                <Link
-                key={s.id}
-                  href={s.href}
+      <div className={`${hideSubOnMobile ? "hidden md:flex" : "flex"} h-[58px] bg-black rounded-xl items-end justify-center px-2`}>
+        {usePartnerCats ? (
+          <div className="flex flex-wrap items-center h-[74%] gap-[24px]">
+            {categories.map((c: any) => (
+              <button
+                key={c.id}
+                onClick={() => onSelectCategory(c.id)}
                className={
-                  s.id === activeSubId
-                    ? "px-3 h-[28px] rounded-full bg-[#F94B37] text-white text-[12px] leading-[28px] whitespace-nowrap"
-                    : "px-3 h-[28px] rounded-full bg-transparent text-white/85 hover:bg-[#F94B37] hover:text-white text-[12px] leading-[28px] whitespace-nowrap"
+                  (selectedCatId || categories[0]?.id) === c.id
+                    ? "px-3 h-full inline-flex items-center bg-white text-[#d73b29] text-[20px] font-[700] rounded-tl-[14px] rounded-tr-[14px] whitespace-nowrap"
+                    : "px-3 h-full inline-flex items-center bg-transparent text-[#d5d5d5] hover:bg-white hover:text-[#d73b29] hover:font-[700] hover:rounded-tl-[14px] hover:rounded-tr-[14px] text-[20px] font-[500] whitespace-nowrap"
                }
              >
-                {s.name}
-                </Link>
+                {c.name}
+              </button>
            ))}
          </div>
+        ) : (
+          Array.isArray(subItems) && subItems.length > 0 && (
+            <div className="flex flex-wrap items-center h-[74%] gap-[24px]">
+              {subItems.map((s) => (
+                <Link
+                  key={s.id}
+                  href={s.href}
+                  className={
+                    s.id === activeSubId
+                      ? "px-3 h-full inline-flex items-center bg-white text-[#d73b29] text-[20px] font-[700] rounded-tl-[14px] rounded-tr-[14px] whitespace-nowrap"
+                      : "px-3 h-full inline-flex items-center bg-transparent text-[#d5d5d5] hover:bg-white hover:text-[#d73b29] hover:font-[700] hover:rounded-tl-[14px] hover:rounded-tr-[14px] text-[20px] font-[500] whitespace-nowrap"
+                  }
+                >
+                  {s.name}
+                </Link>
+              ))}
+            </div>
+          )
+        )}
+        {!usePartnerCats && (!Array.isArray(subItems) || subItems.length === 0) && (
+          <div className="flex items-center gap-[8px]">
+            <span className="px-3 h-[28px] rounded-full bg-transparent text-white/85 text-[12px] leading-[28px] whitespace-nowrap cursor-default">암실소문</span>
+          </div>
        )}
      </div>

--- a/src/app/components/HorizontalCardScroller.tsx
+++ b/src/app/components/HorizontalCardScroller.tsx
@@ -25,6 +25,9 @@ export default function HorizontalCardScroller({ items }: HorizontalCardScroller
  const CARD_WIDTH = 384;
  const CARD_GAP = 16; // Tailwind gap-4
  const SCROLL_STEP = CARD_WIDTH + CARD_GAP;
+  useEffect(() => {
+    console.log(items);
+  }, [items]);

  const updateThumb = useCallback(() => {
    const scroller = scrollRef.current;
@@ -145,7 +148,7 @@ export default function HorizontalCardScroller({ items }: HorizontalCardScroller
        </div>
      </div>

-      <div className="pointer-events-none absolute bottom-[20px] left-1/2 -translate-x-1/2 z-20 flex items-center gap-6">
+      <div className="pointer-events-none absolute bottom-[-5px] left-1/2 -translate-x-1/2 z-20 flex items-center gap-6">
        <button
          type="button"
          aria-label="이전"
--- a/src/app/components/PartnerScroller.tsx
+++ b/src/app/components/PartnerScroller.tsx
@@ -0,0 +1,63 @@
+"use client";
+import useSWR from "swr";
+import { useEffect, useMemo, useState } from "react";
+import HorizontalCardScroller from "@/app/components/HorizontalCardScroller";
+
+const fetcher = (url: string) => fetch(url).then((r) => r.json());
+
+export default function PartnerScroller() {
+  const { data: catData } = useSWR<{ categories: any[] }>("/api/partner-categories", fetcher);
+  const categories = catData?.categories ?? [];
+  const defaultCatId = categories[0]?.id || "";
+  const [selectedId, setSelectedId] = useState<string>(defaultCatId);
+
+  useEffect(() => {
+    if (!selectedId) {
+      let id = "";
+      try {
+        id = (window as any).__partnerCategoryId || localStorage.getItem("selectedPartnerCategoryId") || "";
+      } catch {}
+      if (!id) id = defaultCatId;
+      if (id) setSelectedId(id);
+    }
+  }, [defaultCatId, selectedId]);
+
+  // Listen to HeroBanner selection events
+  useEffect(() => {
+    // initialize from global if present
+    try {
+      const initial = (window as any).__partnerCategoryId;
+      const stored = localStorage.getItem("selectedPartnerCategoryId");
+      if (initial) setSelectedId(initial);
+      else if (stored) setSelectedId(stored);
+    } catch {}
+    const handler = (e: Event) => {
+      const ce = e as CustomEvent<{ id: string }>;
+      if (ce?.detail?.id) setSelectedId(ce.detail.id);
+    };
+    window.addEventListener("partnerCategorySelect", handler as EventListener);
+    return () => window.removeEventListener("partnerCategorySelect", handler as EventListener);
+  }, []);
+
+  const partnersQuery = useMemo(() => (selectedId ? `/api/partners?categoryId=${encodeURIComponent(selectedId)}` : "/api/partners"), [selectedId]);
+  const { data: partnersData } = useSWR<{ partners: any[] }>(partnersQuery, fetcher);
+  const partners = partnersData?.partners ?? [];
+
+  // Fallback to approved partner requests if no partners
+  const { data: reqData } = useSWR<{ items: any[] }>(partners.length === 0 ? "/api/partner-shops" : null, fetcher);
+  const activeCategoryName = useMemo(() => categories.find((c: any) => c.id === selectedId)?.name, [categories, selectedId]);
+  const fallbackItems = useMemo(() => {
+    if (!reqData?.items) return [] as any[];
+    const filtered = activeCategoryName ? reqData.items.filter((it: any) => it.category === activeCategoryName) : reqData.items;
+    return filtered.map((s: any) => ({ id: s.id, region: s.region, name: s.name, address: s.address, image: s.imageUrl || "/sample.jpg" }));
+  }, [reqData, activeCategoryName]);
+
+  const items = partners.length > 0
+    ? partners.map((p: any) => ({ id: p.id, region: p.address ? String(p.address).split(" ")[0] : p.category, name: p.name, address: p.address || "", image: p.imageUrl || "/sample.jpg" }))
+    : fallbackItems;
+
+  if (items.length === 0) return null;
+  return <HorizontalCardScroller items={items} />;
+}
+
+
--- a/src/app/components/PostList.tsx
+++ b/src/app/components/PostList.tsx
@@ -24,7 +24,7 @@ type Resp = {
  page: number;
  pageSize: number;
  items: Item[];
-  sort: "recent" | "popular";
+  sort: "recent" | "popular" | "views" | "likes" | "comments";
 };

 const fetcher = (url: string) => fetch(url).then((r) => r.json());
@@ -35,7 +35,7 @@ function stripHtml(html: string | null | undefined): string {
  return html.replace(/<[^>]*>/g, "").trim();
 }

-export function PostList({ boardId, sort = "recent", q, tag, author, authorId, start, end, variant = "default", newPostHref, titleHoverOrange, pageSizeOverride, compact }: { boardId?: string; sort?: "recent" | "popular"; q?: string; tag?: string; author?: string; authorId?: string; start?: string; end?: string; variant?: "default" | "board"; newPostHref?: string; titleHoverOrange?: boolean; pageSizeOverride?: number; compact?: boolean }) {
+export function PostList({ boardId, sort = "recent", q, tag, author, authorId, start, end, variant = "default", newPostHref, titleHoverOrange, pageSizeOverride, compact }: { boardId?: string; sort?: "recent" | "popular" | "views" | "likes" | "comments"; q?: string; tag?: string; author?: string; authorId?: string; start?: string; end?: string; variant?: "default" | "board"; newPostHref?: string; titleHoverOrange?: boolean; pageSizeOverride?: number; compact?: boolean }) {
  const sp = useSearchParams();
  const listContainerRef = useRef<HTMLDivElement | null>(null);
  const [lockedMinHeight, setLockedMinHeight] = useState<number | null>(null);
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,7 +1,8 @@
 import { HeroBanner } from "@/app/components/HeroBanner";
-import PartnerCategorySection from "@/app/components/PartnerCategorySection";
-import Link from "next/link";
+// PartnerCategorySection removed per request
 import HorizontalCardScroller from "@/app/components/HorizontalCardScroller";
+import PartnerScroller from "@/app/components/PartnerScroller";
+import Link from "next/link";
 import { PostList } from "@/app/components/PostList";
 import ProfileLabelIcon from "@/app/svgs/profilelableicon";
 import SearchIcon from "@/app/svgs/SearchIcon";
@@ -201,37 +202,16 @@ export default async function Home({ searchParams }: { searchParams: Promise<{ s
      {/* 히어로 섹션: 상단 대형 비주얼 영역 (설정 온오프) */}
      {showBanner && (
        <section>
-          <HeroBanner />
+          <HeroBanner showPartnerCats={showPartnerShops} />
        </section>
      )}

-      {/* 배너 아래: 파트너 카테고리 탭 + 파트너 리스트 */}
-      <PartnerCategorySection />
+      {/* 배너 아래: 카테고리 탭 섹션 제거됨 */}

      {/* 제휴 샾 가로 스크롤 (설정 온오프, DB에서 불러오기)
         - 우선 partners 테이블(관리자 페이지 관리 대상) 사용
         - 없으면 partner_shops로 대체 */}
-      {showPartnerShops && (async () => {
-        // 우선순위: partners(관리자 관리) → partner_shops(폴백)
-        let partners: any[] = [];
-        try {
-          partners = await (prisma as any).partner.findMany({ orderBy: [{ sortOrder: "asc" }, { createdAt: "desc" }], take: 10 });
-        } catch (_) {
-          partners = await prisma.partner.findMany({ orderBy: { createdAt: "desc" }, take: 10 });
-        }
-        const items = partners.map((p: any) => ({
-          id: p.id,
-          region: p.address ? String(p.address).split(" ")[0] : p.category,
-          name: p.name,
-          address: p.address || "",
-          image: p.imageUrl || "/sample.jpg",
-        }));
-        if (items.length > 0) return <HorizontalCardScroller items={items} />;
-
-        const shops = await (prisma as any).partnerShop.findMany({ where: { active: true }, orderBy: [{ sortOrder: "asc" }, { createdAt: "desc" }] });
-        const shopItems = shops.map((s: any) => ({ id: s.id, region: s.region, name: s.name, address: s.address, image: s.imageUrl }));
-        return <HorizontalCardScroller items={shopItems} />;
-      })()}
+      {showPartnerShops && <PartnerScroller />}

      {/* 1행: 프로필 + 선택된 보드 2개 (최대 2개) */}
      {(firstTwo.length > 0) && (