From 49ac631e33c0870b77463ca9c08b8ac2eb9d9907 Mon Sep 17 00:00:00 2001 From: Lee Sanghyun <59863112+dev-ant@users.noreply.github.com> Date: Thu, 12 Nov 2026 13:04:41 +0900 Subject: [PATCH 1/2] feat: add Hero administration and XP auction screens --- docs/hero-auctions.md | 15 + docs/hero-link-fixtures.json | 114 ++++ package-lock.json | 4 +- package.json | 2 +- src/app/(main)/admin/hero/page.tsx | 418 ++++++++++++++ src/app/(main)/admin/page.tsx | 3 + src/app/(main)/hero-auctions/page.tsx | 511 ++++++++++++++++++ .../api/admin/hero/[[...segments]]/route.ts | 12 + src/app/api/hero/[[...segments]]/route.ts | 9 + .../api/user/hero/[[...segments]]/route.ts | 12 + .../navigation/ThreeTierNav.test.tsx | 2 +- src/components/navigation/ThreeTierNav.tsx | 5 + src/components/page/hero/HeroCreativeForm.tsx | 197 +++++++ src/components/page/hero/HeroPages.test.tsx | 194 +++++++ .../page/hero/HeroTransactionHistory.tsx | 60 ++ .../page/mypage/ExperiencePanel.test.tsx | 4 + .../page/mypage/ExperiencePanel.tsx | 24 +- src/components/seo/HomeHeroCarousel.test.tsx | 54 ++ src/components/seo/HomeHeroCarousel.tsx | 112 ++-- src/components/seo/HomeLanding.test.tsx | 16 + src/hooks/useExperience.test.tsx | 49 ++ src/hooks/useExperience.ts | 7 +- src/hooks/useHero.test.tsx | 77 +++ src/hooks/useHero.ts | 75 +++ src/lib/api/clients.ts | 1 + src/lib/hero/proxy.test.ts | 90 +++ src/lib/hero/proxy.ts | 85 +++ src/lib/hero/request.ts | 33 ++ src/lib/hero/validation.test.ts | 36 ++ src/lib/hero/validation.ts | 89 +++ src/types/experience.ts | 5 + src/types/hero.ts | 65 +++ 32 files changed, 2340 insertions(+), 40 deletions(-) create mode 100644 docs/hero-auctions.md create mode 100644 docs/hero-link-fixtures.json create mode 100644 src/app/(main)/admin/hero/page.tsx create mode 100644 src/app/(main)/hero-auctions/page.tsx create mode 100644 src/app/api/admin/hero/[[...segments]]/route.ts create mode 100644 src/app/api/hero/[[...segments]]/route.ts create mode 100644 src/app/api/user/hero/[[...segments]]/route.ts create mode 100644 src/components/page/hero/HeroCreativeForm.tsx create mode 100644 src/components/page/hero/HeroPages.test.tsx create mode 100644 src/components/page/hero/HeroTransactionHistory.tsx create mode 100644 src/hooks/useExperience.test.tsx create mode 100644 src/hooks/useHero.test.tsx create mode 100644 src/hooks/useHero.ts create mode 100644 src/lib/hero/proxy.test.ts create mode 100644 src/lib/hero/proxy.ts create mode 100644 src/lib/hero/request.ts create mode 100644 src/lib/hero/validation.test.ts create mode 100644 src/lib/hero/validation.ts create mode 100644 src/types/hero.ts diff --git a/docs/hero-auctions.md b/docs/hero-auctions.md new file mode 100644 index 0000000..1c04b2d --- /dev/null +++ b/docs/hero-auctions.md @@ -0,0 +1,15 @@ +# Hero 관리·XP 광고 경매 + +API 제공자는 Auth이며 BFF는 `/api/hero`, `/api/user/hero`, `/api/admin/hero`를 Gateway의 `/das`로 전달한다. 세부 API 계약은 Auth의 `docs/hero-api.md`를 따른다. + +- `/admin/hero`: 기본 이미지 1~10개 등록·수정·soft delete·순서 변경, 한국 시간 노출 일정, 시간별 최종 노출 미리보기, 사용자 소재 차단, 주차 전체 취소·환불. +- `/hero-auctions`: 소재 등록·선택, 1·2번 개별 입찰, 예약 XP와 참여·거래 이력. 경매 규칙은 화면에서 확인할 수 있다. +- 마이페이지 XP는 `currentXp`를 표시하며 활동 합계 `totalXp`는 기존 API 의미를 유지한다. Auth 우선 배포 중에는 아직 새 필드가 없는 응답만 기존 XP를 표시한다. +- 경매와 지갑은 30초마다 갱신하며 서버 시각으로 마감을 판정한다. 확정은 서버에서 수행한다. 동일 요청의 재시도에는 같은 입찰 멱등성 키를 사용한다. +- Hero는 30초·일정 경계·탭 복귀 시 갱신한다. 종료된 광고는 조회 실패 중에도 제거한다. 공개 조회는 인증 쿠키를 전달하지 않는다. +- 관리 및 사용자 변경 요청은 `X-Hero-Action: 1`과 동일 출처 Origin이 필요하다. 인증은 Auth의 access-token 쿠키를 사용한다. +- 업로드는 JPEG/PNG, 10 MiB, 2,400만 화소 제한이다. 링크 허용 사례는 `hero-link-fixtures.json`을 Auth와 동일하게 유지한다. + +검증: `npm run verify`. 주요 회귀 검증은 Hero 캐러셀·일정 만료, URL 우회, BFF 쿠키/CSRF 경계, 관리자 최소 이미지 보호, 입찰 자격·소재 선택, 외부 상위 입찰 후 XP 예약 해제 표시다. + +운영에서는 Auth 스키마와 API를 먼저 배포한 후 프런트를 배포한다. Auth의 경매 활성화 및 시작일 설정 전에는 경매 오픈 준비 상태를 표시한다. PR 병합과 운영 설정 변경은 별도 승인 절차를 따른다. diff --git a/docs/hero-link-fixtures.json b/docs/hero-link-fixtures.json new file mode 100644 index 0000000..76ee8ef --- /dev/null +++ b/docs/hero-link-fixtures.json @@ -0,0 +1,114 @@ +[ + { + "url": "", + "valid": true + }, + { + "url": "https://www.memonogi.com", + "valid": true + }, + { + "url": "https://guild.memonogi.com/path?q=1#top", + "valid": true + }, + { + "url": "HTTPS://WWW.MEMONOGI.COM:443/a", + "valid": true + }, + { + "url": "https://a.b.memonogi.com/길드", + "valid": true + }, + { + "url": "https://www.memonogi.com/a%20b", + "valid": true + }, + { + "url": " ", + "valid": false + }, + { + "url": "http://www.memonogi.com", + "valid": false + }, + { + "url": "https://memonogi.com", + "valid": false + }, + { + "url": "/guilds", + "valid": false + }, + { + "url": "//www.memonogi.com", + "valid": false + }, + { + "url": "https://memonogi.com.evil.com", + "valid": false + }, + { + "url": "https://evil-memonogi.com", + "valid": false + }, + { + "url": "https://www.memonogi.com@evil.com", + "valid": false + }, + { + "url": "https://@www.memonogi.com", + "valid": false + }, + { + "url": "https://user:password@www.memonogi.com", + "valid": false + }, + { + "url": "https://www.memonogi.com:444", + "valid": false + }, + { + "url": "https://www.memonogi.com.", + "valid": false + }, + { + "url": "https://-bad.memonogi.com", + "valid": false + }, + { + "url": "https://bad_.memonogi.com", + "valid": false + }, + { + "url": "https://www..memonogi.com", + "valid": false + }, + { + "url": "https://한글.memonogi.com", + "valid": false + }, + { + "url": "https://%77ww.memonogi.com", + "valid": false + }, + { + "url": "https://www.memonogi.com/%zz", + "valid": false + }, + { + "url": "https://www.memonogi.com/%", + "valid": false + }, + { + "url": "https://www.memonogi.com\\@evil.com", + "valid": false + }, + { + "url": "https://www.memonogi.com/\nfoo", + "valid": false + }, + { + "url": "https://www.memonogi.com/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "valid": false + } +] diff --git a/package-lock.json b/package-lock.json index c0c4e90..0be399f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "devnogi-front", - "version": "1.0.26", + "version": "1.0.27", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "devnogi-front", - "version": "1.0.26", + "version": "1.0.27", "dependencies": { "@hookform/resolvers": "^5.1.1", "@radix-ui/react-checkbox": "^1.3.3", diff --git a/package.json b/package.json index 336a771..83e5fa4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "devnogi-front", - "version": "1.0.26", + "version": "1.0.27", "private": true, "scripts": { "dev": "next dev", diff --git a/src/app/(main)/admin/hero/page.tsx b/src/app/(main)/admin/hero/page.tsx new file mode 100644 index 0000000..efd8f4c --- /dev/null +++ b/src/app/(main)/admin/hero/page.tsx @@ -0,0 +1,418 @@ +"use client"; + +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import Image from "next/image"; +import Link from "next/link"; +import { useState } from "react"; + +import HeroCreativeForm from "@/components/page/hero/HeroCreativeForm"; +import { Button } from "@/components/ui/button"; +import { useAuth } from "@/contexts/AuthContext"; +import { heroRequest } from "@/lib/hero/request"; +import { + fromKoreanInput, + heroTime, + toKoreanInput, +} from "@/lib/hero/validation"; +import type { + HeroAuctionsResponse, + HeroCreative, + HeroResponse, + HeroSlide, +} from "@/types/hero"; +import { isAdminRole } from "@/utils/roles"; + +function Moderation({ + id, + kind, + onChanged, +}: { + id: number; + kind: "creative" | "auction"; + onChanged: () => Promise; +}) { + const [reason, setReason] = useState(""); + const action = useMutation({ + mutationFn: () => + heroRequest( + kind === "creative" + ? `admin/hero/creatives/${id}/block` + : `admin/hero/auctions/${id}/cancel`, + "POST", + { reason: reason.trim() }, + ), + onSuccess: onChanged, + }); + return ( +
+ + + {action.isError ? ( +

+ {action.error.message} +

+ ) : null} + {action.isSuccess ? ( +

+ 처리했습니다. +

+ ) : null} +
+ ); +} + +export default function HeroAdministration() { + const { user, isLoading } = useAuth(); + const admin = isAdminRole(user?.role); + const cache = useQueryClient(); + const [adding, setAdding] = useState(false); + const [editing, setEditing] = useState(null); + const [previewAt, setPreviewAt] = useState(() => + toKoreanInput(new Date().toISOString()), + ); + const [requestedAt, setRequestedAt] = useState(""); + const slides = useQuery({ + queryKey: ["hero", "admin", "slides", user?.userId], + queryFn: () => heroRequest("admin/hero/slides"), + enabled: admin, + }); + const auctions = useQuery({ + queryKey: ["hero", "admin", "auctions", user?.userId], + queryFn: () => heroRequest("admin/hero/auctions"), + enabled: admin, + refetchInterval: 30_000, + }); + const creatives = useQuery({ + queryKey: ["hero", "admin", "creatives", user?.userId], + queryFn: () => heroRequest("admin/hero/creatives"), + enabled: admin, + }); + const preview = useQuery({ + queryKey: ["hero", "admin", "preview", requestedAt, user?.userId], + queryFn: () => + heroRequest( + `admin/hero/preview?at=${encodeURIComponent(requestedAt)}`, + ), + enabled: admin && !!requestedAt, + }); + async function changed() { + await Promise.all([ + cache.invalidateQueries({ queryKey: ["hero"] }), + cache.invalidateQueries({ queryKey: ["experience"] }), + ]); + } + const remove = useMutation({ + mutationFn: (id: number) => + heroRequest(`admin/hero/slides/${id}`, "DELETE"), + onSuccess: changed, + }); + const order = useMutation({ + mutationFn: (ids: number[]) => + heroRequest("admin/hero/slides/order", "PUT", { ids }), + onSuccess: changed, + }); + const sorted = [...(slides.data ?? [])].sort( + (a, b) => a.position - b.position, + ); + function move(index: number, direction: number) { + const ids = sorted.map((slide) => slide.id); + [ids[index], ids[index + direction]] = [ids[index + direction], ids[index]]; + order.mutate(ids); + } + if (isLoading) return

권한 확인 중…

; + if (!admin) return

관리자 계정으로 로그인해야 합니다.

; + return ( +
+
+ + 운영자 작업 콘솔 + +

메인 Hero·광고 경매 관리

+

+ 기본 이미지 1~10개 · 낙찰 광고는 1·2번 위치에 우선 배치 · 모든 일정은 + 한국 시간 +

+
+
+
+

+ 기본 이미지 ({sorted.length}/10) +

+ +
+ {adding ? ( + { + await heroRequest("admin/hero/slides", "POST", form); + setAdding(false); + await changed(); + }} + /> + ) : null} + {slides.isPending ? ( +

기본 이미지 불러오는 중…

+ ) : null} + {slides.isError ?

{slides.error.message}

: null} + {sorted.map((slide, index) => ( +
+
+
+ {slide.altText} +
+
+

+ {index + 1}. {slide.altText} +

+

+ {slide.linkUrl || "링크 없음"} +

+

+ 시작 {heroTime(slide.startsAt)} · 종료{" "} + {heroTime(slide.endsAt)} +

+
+
+
+ + + + +
+ {editing === slide.id ? ( + { + await heroRequest( + `admin/hero/slides/${slide.id}`, + "PUT", + form, + ); + setEditing(null); + await changed(); + }} + /> + ) : null} +
+ ))} + {remove.isError ?

{remove.error.message}

: null} + {order.isError ?

{order.error.message}

: null} +

+ 삭제는 이력을 보존하며 마지막 기본 이미지는 삭제할 수 없습니다. 예약된 + 광고가 있으면 뒤쪽 기본 이미지는 최대 10개 제한에 따라 잠시 + 제외됩니다. +

+
+
+

시간별 실제 노출 순서

+
{ + event.preventDefault(); + setRequestedAt(fromKoreanInput(previewAt)); + }} + > + + +
+ {preview.isFetching ?

미리보기 불러오는 중…

: null} + {preview.isError ?

{preview.error.message}

: null} +
    + {preview.data?.items.map((slide) => ( +
  1. +
    + {slide.altText} +
    +

    + {slide.position}번 ·{" "} + {slide.advertisement ? "낙찰 광고" : "기본 이미지"} ·{" "} + {slide.altText} +

    +
  2. + ))} +
+
+
+

경매 현황·운영 취소

+ + 사용자 경매 화면 보기 + + {auctions.isPending ?

경매 불러오는 중…

: null} + {auctions.isError ?

{auctions.error.message}

: null} + {auctions.data && !auctions.data.enabled ? ( +

+ 현재 경매가 비활성화되어 있습니다. 운영 설정과 시작일을 + 확인해주세요. +

+ ) : null} + {Array.from( + new Set(auctions.data?.auctions.map((auction) => auction.weekStart)), + ).map((week) => { + const pair = + auctions.data?.auctions.filter( + (auction) => auction.weekStart === week, + ) ?? []; + return ( +
+

{week} 주차

+ {pair.map((auction) => ( +

+ {auction.slot}번 ·{" "} + {auction.status === "OPEN" + ? "진행·정산 대기" + : auction.status === "SETTLED" + ? "확정" + : "취소"}{" "} + · {auction.highestBid.toLocaleString()} XP ·{" "} + {auction.winningBidId ? "낙찰" : "낙찰 없음"} + {auction.reason ? ` · ${auction.reason}` : ""} +

+ ))} +

+ 마감 {heroTime(pair[0]?.closesAt ?? null)} · 노출 시작{" "} + {heroTime(pair[0]?.displayStartsAt ?? null)} +

+ {pair.some((auction) => auction.status !== "CANCELLED") ? ( + + ) : null} +
+ ); + })} +
+
+

사용자 광고 소재 관리

+

+ 최근 등록 100개와 입찰·예정·노출에 사용 중인 소재입니다. 차단하면 진행 + 중 입찰 또는 예정·노출 광고를 중단하며, 이미 지불한 XP는 환불하지 + 않습니다. +

+ {creatives.isPending ?

소재 불러오는 중…

: null} + {creatives.isError ? ( +

{creatives.error.message}

+ ) : null} +
+ {creatives.data?.map((creative) => ( +
+
+ {creative.altText} +
+

+ #{creative.id} {creative.altText} +

+

+ {creative.linkUrl || "링크 없음"} +

+ {creative.blocked ? ( +

차단된 소재

+ ) : ( + + )} +
+ ))} +
+
+
+ ); +} diff --git a/src/app/(main)/admin/page.tsx b/src/app/(main)/admin/page.tsx index d9a4b1e..c1065b3 100644 --- a/src/app/(main)/admin/page.tsx +++ b/src/app/(main)/admin/page.tsx @@ -392,6 +392,9 @@ export default function AdminPage() {

ADMIN 전용

운영자 작업 콘솔

+ + 메인 Hero·광고 경매 관리 + 길드 등록 심사 및 마스터 지정 diff --git a/src/app/(main)/hero-auctions/page.tsx b/src/app/(main)/hero-auctions/page.tsx new file mode 100644 index 0000000..c6a046f --- /dev/null +++ b/src/app/(main)/hero-auctions/page.tsx @@ -0,0 +1,511 @@ +"use client"; + +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import Image from "next/image"; +import Link from "next/link"; +import { FormEvent, useEffect, useRef, useState } from "react"; + +import HeroCreativeForm from "@/components/page/hero/HeroCreativeForm"; +import HeroTransactionHistory from "@/components/page/hero/HeroTransactionHistory"; +import { Button } from "@/components/ui/button"; +import { useAuth } from "@/contexts/AuthContext"; +import { useExperience } from "@/hooks/useExperience"; +import { heroRequest } from "@/lib/hero/request"; +import { heroTime } from "@/lib/hero/validation"; +import type { + HeroAuction, + HeroAuctionsResponse, + HeroCreative, + HeroHistory, +} from "@/types/hero"; + +const bidLabels: Record = { + LEADING: "최고 입찰 · XP 예약 중", + OUTBID: "상위 입찰 발생 · 예약 해제", + WON: "낙찰", + INVALID: "무효 · 예약 해제", + CANCELLED: "취소", + BLOCKED: "소재 차단", +}; + +function AuctionBid({ + auction, + creativeId, + canBid, + userId, + availableXp, + onChanged, + now, +}: { + auction: HeroAuction; + creativeId: number | null; + canBid: boolean; + userId: number; + availableXp: number; + onChanged: () => Promise; + now: number; +}) { + const minimum = Math.max(10, auction.highestBid + 1); + const [amount, setAmount] = useState(""); + const retry = useRef<{ signature: string; key: string } | null>(null); + const open = + auction.status === "OPEN" && + Date.parse(auction.opensAt) <= now && + now < Date.parse(auction.closesAt); + const budget = + availableXp + (auction.highestBidderId === userId ? auction.highestBid : 0); + const bid = useMutation({ + mutationFn: async () => { + const value = Number(amount); + if ( + !creativeId || + !Number.isSafeInteger(value) || + value < minimum || + value > budget + ) + throw new Error("소재와 입찰 가능 XP를 확인해주세요."); + const signature = `${auction.id}:${creativeId}:${value}`; + if (retry.current?.signature !== signature) + retry.current = { signature, key: crypto.randomUUID() }; + return heroRequest(`user/hero/auctions/${auction.id}/bids`, "POST", { + creativeId, + amount: value, + idempotencyKey: retry.current.key, + }); + }, + onSuccess: async () => { + retry.current = null; + setAmount(""); + await onChanged(); + }, + onError: () => { + void onChanged(); + }, + }); + function submit(event: FormEvent) { + event.preventDefault(); + bid.mutate(); + } + return ( +
+

{auction.slot}번 광고

+

+ {auction.highestBid.toLocaleString()}{" "} + XP +

+

+ {auction.highestBid === 0 + ? "첫 입찰을 기다리고 있습니다." + : auction.highestBidderId === userId + ? "내 입찰이 현재 최고가입니다." + : "현재 최고 입찰가"} +

+

마감 {heroTime(auction.closesAt)}

+ {auction.status === "SETTLED" ? ( +

+ {auction.winningBidId ? "낙찰 확정" : "유찰 · 기본 이미지로 대체"} +

+ ) : auction.status === "CANCELLED" ? ( +

취소된 경매

+ ) : !open ? ( +

입찰 종료 · 결과 확정 대기

+ ) : null} +

+ 노출 {heroTime(auction.displayStartsAt)} ~{" "} + {heroTime(auction.displayEndsAt)} +

+
+ +

+ 입찰 가능 {budget.toLocaleString()} XP · 최종 입찰액만 낙찰 시 + 차감됩니다. +

+ +
+ {bid.isError ? ( +

+ {bid.error.message} +

+ ) : null} + {bid.isSuccess ? ( +

+ 입찰했습니다. 최고가와 예약 XP를 갱신했습니다. +

+ ) : null} + {auction.reason ?

{auction.reason}

: null} +
+ ); +} + +function Participation({ + userId, + auctions, + enabled, + now, +}: { + userId: number; + auctions: HeroAuction[]; + enabled: boolean; + now: number; +}) { + const cache = useQueryClient(); + const { refreshUser } = useAuth(); + const xp = useExperience(userId, { refetchInterval: 30_000 }); + const [selected, setSelected] = useState(null); + const [showUpload, setShowUpload] = useState(false); + const creatives = useQuery({ + queryKey: ["hero", "creatives", userId], + queryFn: () => heroRequest("user/hero/creatives"), + retry: false, + }); + const history = useQuery({ + queryKey: ["hero", "history", userId], + queryFn: () => heroRequest("user/hero/auctions"), + refetchInterval: 30_000, + refetchOnWindowFocus: "always", + }); + const data = xp.data; + const currentXp = data?.currentXp ?? data?.totalXp ?? 0; + const availableXp = data?.availableXp ?? currentXp; + const reservedXp = data?.reservedXp ?? 0; + const eligible = enabled && !!data?.eligible && currentXp >= 45; + const chosen = creatives.data?.find( + (creative) => creative.id === selected && !creative.blocked, + ); + async function changed() { + await Promise.all([ + cache.invalidateQueries({ queryKey: ["hero"] }), + cache.invalidateQueries({ queryKey: ["experience", userId] }), + refreshUser(), + ]); + } + const remove = useMutation({ + mutationFn: (id: number) => + heroRequest(`user/hero/creatives/${id}`, "DELETE"), + onSuccess: changed, + }); + return ( + <> +
+

내 입찰 준비

+ {xp.isPending ?

XP를 확인하는 중…

: null} + {xp.isError ?

XP를 불러오지 못했습니다.

: null} + {data ? ( + <> +

+ + 현재 {currentXp.toLocaleString()} XP + + + 예약 {reservedXp.toLocaleString()} XP + + + 사용 가능 {availableXp.toLocaleString()} XP + +

+ {!data.eligible || currentXp < 45 ? ( +

+ 캐릭터 인증을 완료한 수석(45 XP) 이상 회원만 입찰할 수 있습니다. +

+ ) : null} + {reservedXp > currentXp ? ( +

+ 활동 XP가 회수되어 예약액이 현재 XP를 초과했습니다. 마감 시 + 잔액이 부족하면 두 자리의 입찰이 모두 무효가 됩니다. +

+ ) : null} + {(data.deficitXp ?? 0) > 0 ? ( +

+ XP 부족분 {data.deficitXp?.toLocaleString()} XP는 이후 + 적립분에서 먼저 상쇄됩니다. +

+ ) : null} + + ) : null} + + {showUpload ? ( + { + const created = await heroRequest( + "user/hero/creatives", + "POST", + form, + ); + setSelected(created.id); + await changed(); + }} + /> + ) : null} +

입찰에 사용할 소재 선택

+ {creatives.isPending ?

소재 불러오는 중…

: null} + {creatives.isError ? ( +

{creatives.error.message}

+ ) : null} + {creatives.data?.length === 0 ? ( +

+ 이미지를 먼저 등록해주세요. 링크는 선택 사항입니다. +

+ ) : null} +
+ {creatives.data?.map((creative) => ( +
+
+ {creative.altText} +
+ +

+ {creative.linkUrl || "링크 없음"} +

+ +
+ ))} +
+ {remove.isError ? ( +

+ {remove.error.message} +

+ ) : null} +
+
+ {auctions.map((auction) => ( + + ))} +
+
+

내 참여 이력

+ {history.isPending ?

참여 이력 불러오는 중…

: null} + {history.isError ?

{history.error.message}

: null} + {history.data?.bids.length === 0 ? ( +

+ 아직 입찰 내역이 없습니다. +

+ ) : null} +
    + {history.data?.bids.map((bid) => ( +
  • +

    + 경매 #{bid.auctionId} · {bid.amount.toLocaleString()} XP ·{" "} + {bidLabels[bid.status] ?? bid.status} +

    + + {bid.reason ?

    {bid.reason}

    : null} +
  • + ))} +
+

최근 100건

+ +
+ + ); +} + +export default function HeroAuctionsPage() { + const { user, isLoading } = useAuth(); + const query = useQuery({ + queryKey: ["hero", "auctions"], + queryFn: () => heroRequest("hero/auctions/current"), + refetchInterval: 30_000, + refetchOnWindowFocus: "always", + retry: false, + }); + const [now, setNow] = useState(Date.now); + useEffect(() => { + const timer = window.setInterval(() => setNow(Date.now()), 1000); + return () => window.clearInterval(timer); + }, []); + const serverNow = query.data + ? Date.parse(query.data.serverTime) + Math.max(0, now - query.dataUpdatedAt) + : now; + const all = query.data?.auctions ?? []; + const latest = all + .map((item) => item.weekStart) + .sort() + .at(-1); + const current = all + .filter((item) => item.weekStart === latest) + .sort((a, b) => a.slot - b.slot); + return ( +
+
+

메인 Hero · 주간 광고

+

XP로 나의 광고를 알리세요

+

+ 매주 월요일 00시부터 일요일 22시까지, 1·2번 자리를 각각 경매합니다. + 낙찰 광고는 다음 월요일부터 7일간 노출됩니다. 모든 시각은 한국 + 시간입니다. +

+
+
+ + 입찰 전에 경매 규칙 확인 + +
    +
  • + 인증된 정상 회원이면서 수석(45 XP) 이상이어야 합니다. 최소 10 XP, 1 + XP 단위로 현재 최고가보다 높게 입찰합니다. +
  • +
  • + 최고 입찰액은 예약되며 다른 사람이 높은 금액을 부르면 즉시 + 해제됩니다. 낙찰자만 최종 입찰액을 지불하고 등급이 내려갈 수 + 있습니다. +
  • +
  • + 두 자리 모두 낙찰받을 수 있습니다. 마감 직전 등급과 합산 잔액을 + 검사하며, 합산 잔액이 부족하면 두 입찰 모두 무효입니다. 차순위에게 + 승계하지 않습니다. +
  • +
  • + 입찰 취소·금액 인하·자동 입찰·마감 연장은 없습니다. 소재 교체는 더 + 높은 금액으로 재입찰해야 하며 낙찰 이후에는 바꿀 수 없습니다. +
  • +
  • + 정책 위반 소재는 사전 심사 없이도 관리자가 차단할 수 있으며 노출 + 중단 시 환불하지 않습니다. 운영 사유로 경매를 취소하면 전액 + 환불합니다. +
  • +
  • + 활동 삭제로 XP가 회수될 수 있습니다. 이미 소비한 XP의 부족분은 이후 + 적립에서 먼저 상쇄됩니다. +
  • +
+
+ {query.isPending ?

경매 불러오는 중…

: null} + {query.isError ? ( +

+ {query.error.message}{" "} + +

+ ) : null} + {query.data && !query.data.enabled ? ( +

+ 경매 오픈 준비 중입니다. 공개된 시작 일정부터 입찰할 수 있습니다. +

+ ) : null} + {isLoading ? ( +

로그인 확인 중…

+ ) : user ? ( + + ) : ( +
+

광고 소재 등록과 입찰은 로그인 후 이용할 수 있습니다.

+ + 로그인하기 + + {current.map((auction) => ( +

+ {auction.slot}번 · 최고가 {auction.highestBid.toLocaleString()} XP + · 마감 {heroTime(auction.closesAt)} +

+ ))} +
+ )} + {all.some((item) => item.weekStart !== latest) ? ( +
+

지난 경매 결과

+ {all + .filter((item) => item.weekStart !== latest) + .map((auction) => ( +

+ {auction.slot}번 ·{" "} + {auction.winningBidId + ? `${auction.highestBid.toLocaleString()} XP 낙찰` + : auction.status === "CANCELLED" + ? "취소" + : "유찰 또는 정산 대기"}{" "} + · 노출 {heroTime(auction.displayStartsAt)} ~{" "} + {heroTime(auction.displayEndsAt)} + {auction.reason ? ` · ${auction.reason}` : ""} +

+ ))} +
+ ) : null} +
+ ); +} diff --git a/src/app/api/admin/hero/[[...segments]]/route.ts b/src/app/api/admin/hero/[[...segments]]/route.ts new file mode 100644 index 0000000..afcc5b3 --- /dev/null +++ b/src/app/api/admin/hero/[[...segments]]/route.ts @@ -0,0 +1,12 @@ +import { NextRequest } from "next/server"; + +import { proxyHero } from "@/lib/hero/proxy"; +type Context = { params: Promise<{ segments?: string[] }> }; +async function handle(request: NextRequest, context: Context) { + const { segments = [] } = await context.params; + return proxyHero(request, segments, "admin"); +} +export const GET = handle; +export const POST = handle; +export const PUT = handle; +export const DELETE = handle; diff --git a/src/app/api/hero/[[...segments]]/route.ts b/src/app/api/hero/[[...segments]]/route.ts new file mode 100644 index 0000000..a22e49b --- /dev/null +++ b/src/app/api/hero/[[...segments]]/route.ts @@ -0,0 +1,9 @@ +import { NextRequest } from "next/server"; + +import { proxyHero } from "@/lib/hero/proxy"; +type Context = { params: Promise<{ segments?: string[] }> }; +async function handle(request: NextRequest, context: Context) { + const { segments = [] } = await context.params; + return proxyHero(request, segments, "public"); +} +export const GET = handle; diff --git a/src/app/api/user/hero/[[...segments]]/route.ts b/src/app/api/user/hero/[[...segments]]/route.ts new file mode 100644 index 0000000..98b03b0 --- /dev/null +++ b/src/app/api/user/hero/[[...segments]]/route.ts @@ -0,0 +1,12 @@ +import { NextRequest } from "next/server"; + +import { proxyHero } from "@/lib/hero/proxy"; +type Context = { params: Promise<{ segments?: string[] }> }; +async function handle(request: NextRequest, context: Context) { + const { segments = [] } = await context.params; + return proxyHero(request, segments, "user"); +} +export const GET = handle; +export const POST = handle; +export const PUT = handle; +export const DELETE = handle; diff --git a/src/components/navigation/ThreeTierNav.test.tsx b/src/components/navigation/ThreeTierNav.test.tsx index f821dd5..ebcbda8 100644 --- a/src/components/navigation/ThreeTierNav.test.tsx +++ b/src/components/navigation/ThreeTierNav.test.tsx @@ -158,7 +158,7 @@ it("의장 메뉴를 커뮤니티와 경매장 사이에 표시하고 하위 경 const link = within(nav).getByRole("link", { name: "의장" }); expect(link).toHaveAttribute("href", "/outfits"); expect(link).toHaveAttribute("aria-current", "page"); - expect(nav.textContent).toMatch(/커뮤니티길드의장경매장/); + expect(nav.textContent).toMatch(/커뮤니티광고 경매길드의장경매장/); expect(within(nav).getByRole("link", { name: "길드" })).toHaveAttribute( "href", "/guilds", diff --git a/src/components/navigation/ThreeTierNav.tsx b/src/components/navigation/ThreeTierNav.tsx index 2d09c66..1d5936f 100644 --- a/src/components/navigation/ThreeTierNav.tsx +++ b/src/components/navigation/ThreeTierNav.tsx @@ -203,6 +203,11 @@ export default function ThreeTierNav() { label="커뮤니티" pathname={pathname} /> + Promise; + label?: string; +}) { + const id = useId(); + const [file, setFile] = useState(null); + const [preview, setPreview] = useState(initial?.imageUrl ?? ""); + const [altText, setAltText] = useState(initial?.altText ?? ""); + const [linkUrl, setLinkUrl] = useState(initial?.linkUrl ?? ""); + const [startsAt, setStartsAt] = useState( + toKoreanInput(initial?.startsAt ?? null), + ); + const [endsAt, setEndsAt] = useState(toKoreanInput(initial?.endsAt ?? null)); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(""); + const [saved, setSaved] = useState(false); + useEffect(() => { + if (!file) { + setPreview(initial?.imageUrl ?? ""); + return; + } + const url = URL.createObjectURL(file); + setPreview(url); + return () => URL.revokeObjectURL(url); + }, [file, initial?.imageUrl]); + async function submit(event: FormEvent) { + event.preventDefault(); + setError(""); + setSaved(false); + setBusy(true); + try { + validateHeroLink(linkUrl); + if (!file && !initial) throw new Error("광고 이미지를 등록해주세요."); + if (file) await validateHeroImage(file); + if (startsAt && endsAt && startsAt >= endsAt) + throw new Error("종료 시각은 시작 시각보다 뒤여야 합니다."); + const form = new FormData(); + if (file) form.set("image", file); + form.set("altText", altText.trim()); + form.set("linkUrl", linkUrl); + if (scheduling) { + form.set("startsAt", fromKoreanInput(startsAt)); + form.set("endsAt", fromKoreanInput(endsAt)); + } + await onSave(form); + setSaved(true); + } catch (cause) { + setError(cause instanceof Error ? cause.message : "등록하지 못했습니다."); + } finally { + setBusy(false); + } + } + const input = + "mt-1 block w-full rounded-md border border-input bg-background p-2 text-sm"; + return ( +
+ +

+ JPEG·PNG, 최대 10 MiB·2,400만 화소. 권장 1920×640. 화면 크기에 따라 + 가장자리가 잘리고 검색창이 겹칩니다. +

+ + +

+ https://*.memonogi.com만 허용합니다. memonogi.com 자체 및 외부 사이트는 + 사용할 수 없습니다. +

+ {scheduling ? ( +
+ + +

+ 비워두면 제한이 없습니다. 종료 시각부터 노출되지 않습니다. +

+
+ ) : null} + {preview ? ( +
+

실제 배치 미리보기

+ {[ + { label: "데스크톱", className: "aspect-[5/1]" }, + { label: "모바일", className: "mx-auto h-56 max-w-[360px]" }, + ].map((view) => ( +
+
+ {view.label} +
+
+ {altText + +
+
+ ))} +
+ ) : null} + {error ? ( +

+ {error} +

+ ) : null} + {saved ? ( +

+ 저장했습니다. +

+ ) : null} + +
+ ); +} diff --git a/src/components/page/hero/HeroPages.test.tsx b/src/components/page/hero/HeroPages.test.tsx new file mode 100644 index 0000000..93e3d4e --- /dev/null +++ b/src/components/page/hero/HeroPages.test.tsx @@ -0,0 +1,194 @@ +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { fireEvent, render, screen, waitFor } from "@testing-library/react"; + +import HeroAdministration from "@/app/(main)/admin/hero/page"; +import HeroAuctionsPage from "@/app/(main)/hero-auctions/page"; +import { useAuth } from "@/contexts/AuthContext"; +import { useExperience } from "@/hooks/useExperience"; +import { heroRequest } from "@/lib/hero/request"; +import { experienceSummaryFixture } from "@/mocks/data/experience"; + +jest.mock("@/contexts/AuthContext", () => ({ useAuth: jest.fn() })); +jest.mock("@/hooks/useExperience", () => ({ useExperience: jest.fn() })); +jest.mock("@/lib/hero/request", () => ({ heroRequest: jest.fn() })); + +const request = jest.mocked(heroRequest); +const auth = jest.mocked(useAuth); +const experience = jest.mocked(useExperience); +const slide = { + id: 1, + imageUrl: "/home-hero-library-v2.png", + altText: "기본 이미지", + linkUrl: null, + position: 1, + advertisement: false, + startsAt: null, + endsAt: null, +}; +const creative = { + id: 8, + imageUrl: "/home-hero-library-v2.png", + altText: "내 광고", + linkUrl: null, + blocked: false, + createdAt: "2026-11-12T00:00:00Z", +}; +const auction = { + id: 10, + weekStart: "2026-11-09", + slot: 1, + status: "OPEN", + opensAt: "2026-11-09T00:00:00Z", + closesAt: "2026-11-15T13:00:00Z", + displayStartsAt: "2026-11-15T15:00:00Z", + displayEndsAt: "2026-11-22T15:00:00Z", + highestBid: 0, + highestBidderId: null, + winningBidId: null, + reason: null, +}; +function mount(page: React.ReactNode) { + const client = new QueryClient({ + defaultOptions: { queries: { retry: false }, mutations: { retry: false } }, + }); + return render( + {page}, + ); +} +beforeEach(() => { + auth.mockReturnValue({ + user: { + mainChannel: null, + guildName: null, + race: null, + arcana: null, + preferredColors: [], + mbti: null, + bio: null, + userId: 7, + nickname: "회원", + email: "member@example.test", + profileImageUrl: null, + role: "ADMIN", + }, + isAuthenticated: true, + isLoading: false, + login: jest.fn(), + logout: jest.fn(), + refreshUser: jest.fn().mockResolvedValue(undefined), + }); + experience.mockReturnValue({ + data: { + ...experienceSummaryFixture, + currentXp: 70, + availableXp: 70, + reservedXp: 0, + }, + isPending: false, + isError: false, + } as ReturnType); + request.mockReset(); + request.mockImplementation(async (path, method) => { + if (method && method !== "GET") return null; + if (path === "admin/hero/slides") return [slide]; + if (path.includes("auctions") && !path.startsWith("user/")) + return { + auctions: [auction, { ...auction, id: 11, slot: 2 }], + enabled: true, + serverTime: "2026-11-12T00:00:00Z", + }; + if (path.endsWith("creatives")) return [creative]; + if (path === "user/hero/auctions") return { bids: [], charges: [] }; + return { + items: [slide], + nextChangeAt: null, + serverTime: "2026-11-12T00:00:00Z", + }; + }); +}); + +it("requires a selected creative and submits an idempotent bid without trusting role for grade", async () => { + mount(); + const input = await screen.findByRole("spinbutton", { + name: "1번 입찰액 (XP)", + }); + fireEvent.change(input, { target: { value: "10" } }); + expect(screen.getByRole("button", { name: "1번 입찰하기" })).toBeDisabled(); + fireEvent.click(await screen.findByRole("radio", { name: "내 광고" })); + fireEvent.click(screen.getByRole("button", { name: "1번 입찰하기" })); + await waitFor(() => + expect(request).toHaveBeenCalledWith( + "user/hero/auctions/10/bids", + "POST", + expect.objectContaining({ + creativeId: 8, + amount: 10, + idempotencyKey: expect.any(String), + }), + ), + ); +}); + +it("disables bidding below SENIOR even for an admin", async () => { + experience.mockReturnValue({ + data: { + ...experienceSummaryFixture, + currentXp: 44, + availableXp: 44, + reservedXp: 0, + }, + isPending: false, + isError: false, + } as ReturnType); + mount(); + fireEvent.click(await screen.findByRole("radio", { name: "내 광고" })); + fireEvent.change( + screen.getByRole("spinbutton", { name: "1번 입찰액 (XP)" }), + { target: { value: "10" } }, + ); + expect(screen.getByRole("button", { name: "1번 입찰하기" })).toBeDisabled(); + expect(screen.getByText(/캐릭터 인증을 완료한 수석/)).toBeInTheDocument(); +}); + +it("protects the final default image and sends required moderation reason", async () => { + mount(); + expect(await screen.findByRole("button", { name: "삭제" })).toBeDisabled(); + const block = await screen.findByRole("button", { + name: "소재 차단·광고 중단 (환불 없음)", + }); + expect(block).toBeDisabled(); + fireEvent.change(screen.getByRole("textbox", { name: "소재 차단 사유" }), { + target: { value: "운영 정책 위반" }, + }); + fireEvent.click(block); + await waitFor(() => + expect(request).toHaveBeenCalledWith( + "admin/hero/creatives/8/block", + "POST", + { reason: "운영 정책 위반" }, + ), + ); +}); + +it("does not request administrator data for an ordinary member", () => { + auth.mockReturnValue({ + ...auth(), + user: { + mainChannel: null, + guildName: null, + race: null, + arcana: null, + preferredColors: [], + mbti: null, + bio: null, + userId: 7, + nickname: "회원", + email: "member@example.test", + profileImageUrl: null, + role: "USER", + }, + }); + mount(); + expect(screen.getByRole("alert")).toHaveTextContent("관리자 계정"); + expect(request).not.toHaveBeenCalled(); +}); diff --git a/src/components/page/hero/HeroTransactionHistory.tsx b/src/components/page/hero/HeroTransactionHistory.tsx new file mode 100644 index 0000000..ebb4ef1 --- /dev/null +++ b/src/components/page/hero/HeroTransactionHistory.tsx @@ -0,0 +1,60 @@ +"use client"; + +import { useQuery } from "@tanstack/react-query"; + +import { heroRequest } from "@/lib/hero/request"; +import { heroTime } from "@/lib/hero/validation"; +import type { HeroHistory } from "@/types/hero"; + +export default function HeroTransactionHistory({ userId }: { userId: number }) { + const history = useQuery({ + queryKey: ["hero", "history", userId], + queryFn: () => heroRequest("user/hero/auctions"), + retry: false, + refetchOnMount: "always", + }); + return ( +
+

광고 XP 거래 이력

+ {history.isPending ? ( +

+ 거래 이력을 불러오는 중… +

+ ) : null} + {history.isError ? ( +

+ {history.error.message} +

+ ) : null} + {history.data?.charges.length === 0 ? ( +

+ 광고 결제·환불 내역이 없습니다. +

+ ) : null} +
    + {history.data?.charges.map((charge) => ( +
  • + + {charge.kind === "REFUND" ? "광고 환불" : "광고 낙찰"} · 경매 # + {charge.auctionId} + + + + {charge.amount > 0 ? "−" : "+"} + {Math.abs(charge.amount).toLocaleString()} XP + +
  • + ))} +
+

최근 100건 · 한국 시간

+
+ ); +} diff --git a/src/components/page/mypage/ExperiencePanel.test.tsx b/src/components/page/mypage/ExperiencePanel.test.tsx index 182f33b..7368e86 100644 --- a/src/components/page/mypage/ExperiencePanel.test.tsx +++ b/src/components/page/mypage/ExperiencePanel.test.tsx @@ -15,6 +15,10 @@ import { import ExperiencePanel from "./ExperiencePanel"; +jest.mock("@/lib/hero/request", () => ({ + heroRequest: jest.fn().mockResolvedValue({ bids: [], charges: [] }), +})); + jest.mock("@/lib/api/clients", () => ({ clientAxios: { get: jest.fn() } })); const get = jest.mocked(clientAxios.get); diff --git a/src/components/page/mypage/ExperiencePanel.tsx b/src/components/page/mypage/ExperiencePanel.tsx index f06d962..021601e 100644 --- a/src/components/page/mypage/ExperiencePanel.tsx +++ b/src/components/page/mypage/ExperiencePanel.tsx @@ -2,6 +2,7 @@ import Link from "next/link"; +import HeroTransactionHistory from "@/components/page/hero/HeroTransactionHistory"; import ActivityGradeBadge from "@/components/ui/ActivityGradeBadge"; import { Button } from "@/components/ui/button"; import { useExperience, useExperienceHistory } from "@/hooks/useExperience"; @@ -56,12 +57,28 @@ export default function ExperiencePanel({ userId }: { userId: number }) { verified={data.eligible} />

- {data.totalXp.toLocaleString()}{" "} + {(data.currentXp ?? data.totalXp).toLocaleString()}{" "} XP

+

+ 예약 {data.reservedXp ?? 0} XP · 사용 가능{" "} + {data.availableXp ?? data.currentXp ?? data.totalXp} XP · 광고 + 순소비 {data.spentXp ?? 0} XP +

+ {(data.deficitXp ?? 0) > 0 ? ( +

+ 부족분 {data.deficitXp} XP는 이후 적립분에서 먼저 상쇄됩니다. +

+ ) : null} + + 주간 광고 경매 참여하기 + {data.eligible ? (
@@ -102,7 +119,7 @@ export default function ExperiencePanel({ userId }: { userId: number }) { 등급 @@ -181,6 +198,7 @@ export default function ExperiencePanel({ userId }: { userId: number }) { ) : null} + ); } diff --git a/src/components/seo/HomeHeroCarousel.test.tsx b/src/components/seo/HomeHeroCarousel.test.tsx index 9cc3d15..facca0e 100644 --- a/src/components/seo/HomeHeroCarousel.test.tsx +++ b/src/components/seo/HomeHeroCarousel.test.tsx @@ -1,7 +1,33 @@ import { act, fireEvent, render, screen } from "@testing-library/react"; +import { useHero } from "@/hooks/useHero"; + import HomeHeroCarousel from "./HomeHeroCarousel"; +jest.mock("@/hooks/useHero", () => ({ useHero: jest.fn() })); +const mockUseHero = jest.mocked(useHero); +const slidesFixture = [ + { + id: 1, + imageUrl: "/home-hero-library-v2.png", + altText: "도서관", + linkUrl: null, + position: 1, + advertisement: false, + startsAt: null, + endsAt: null, + }, + { + id: 2, + imageUrl: "/home-hero-winter.png", + altText: "겨울", + linkUrl: null, + position: 2, + advertisement: false, + startsAt: null, + endsAt: null, + }, +]; const matchMedia = jest.fn(); beforeAll(() => { @@ -13,6 +39,7 @@ beforeAll(() => { beforeEach(() => { jest.useFakeTimers(); + mockUseHero.mockReturnValue(slidesFixture); matchMedia.mockReturnValue({ matches: false }); }); @@ -109,3 +136,30 @@ it("실행 중 모션 감소 설정이 바뀌면 자동 전환을 멈춘다", () unmount(); expect(query.removeEventListener).toHaveBeenCalled(); }); + +it("이미지 한 개면 이동과 자동 전환을 비활성화한다", () => { + mockUseHero.mockReturnValue([slidesFixture[0]]); + render(); + expect( + screen.getByRole("button", { name: "다음 Hero 이미지" }), + ).toBeDisabled(); + expect(screen.getAllByTestId("hero-slide")).toHaveLength(1); +}); +it("현재 광고의 검증된 링크만 활성화한다", () => { + mockUseHero.mockReturnValue([ + { + ...slidesFixture[0], + advertisement: true, + linkUrl: "https://www.memonogi.com/guilds", + }, + { ...slidesFixture[1], linkUrl: "https://evil.com" }, + ]); + render(); + expect(screen.getByRole("link", { name: "도서관" })).toHaveAttribute( + "href", + "https://www.memonogi.com/guilds", + ); + expect(screen.getByText("광고")).toBeInTheDocument(); + fireEvent.click(screen.getByRole("button", { name: "다음 Hero 이미지" })); + expect(screen.queryByRole("link")).not.toBeInTheDocument(); +}); diff --git a/src/components/seo/HomeHeroCarousel.tsx b/src/components/seo/HomeHeroCarousel.tsx index 96e1bfd..dc6034b 100644 --- a/src/components/seo/HomeHeroCarousel.tsx +++ b/src/components/seo/HomeHeroCarousel.tsx @@ -4,15 +4,24 @@ import { ChevronLeft, ChevronRight, Pause, Play } from "lucide-react"; import Image from "next/image"; import { useEffect, useState } from "react"; +import { useHero } from "@/hooks/useHero"; +import { validateHeroLink } from "@/lib/hero/validation"; + import styles from "./HomeHeroCarousel.module.css"; -const heroSlides = [ - { src: "/home-hero-library-v2.png", position: styles.library }, - { src: "/home-hero-winter.png", position: styles.winter }, -]; +function safeLink(value: string | null) { + try { + return validateHeroLink(value ?? ""); + } catch { + return null; + } +} export default function HomeHeroCarousel() { + const slides = useHero(); const [activeSlide, setActiveSlide] = useState(0); + const [failedImages, setFailedImages] = useState([]); const [paused, setPaused] = useState(false); const [reducedMotion, setReducedMotion] = useState(false); + const active = activeSlide % slides.length; useEffect(() => { const query = window.matchMedia?.("(prefers-reduced-motion: reduce)"); const sync = () => setReducedMotion(query?.matches ?? false); @@ -21,43 +30,76 @@ export default function HomeHeroCarousel() { return () => query?.removeEventListener?.("change", sync); }, []); useEffect(() => { - if (paused || reducedMotion) return; + if (paused || reducedMotion || slides.length < 2) return; const timer = window.setInterval( - () => setActiveSlide((current) => (current + 1) % heroSlides.length), + () => setActiveSlide((current) => (current + 1) % slides.length), 7000, ); return () => window.clearInterval(timer); - }, [activeSlide, paused, reducedMotion]); + }, [activeSlide, paused, reducedMotion, slides.length]); const move = (direction: number) => setActiveSlide( - (current) => - (current + direction + heroSlides.length) % heroSlides.length, + (current) => (current + direction + slides.length) % slides.length, ); return (
- {heroSlides.map(({ src, position }, index) => ( - - ))} + {slides.map((slide, index) => { + const failed = failedImages.includes(slide.imageUrl); + const link = failed ? null : safeLink(slide.linkUrl); + return ( +
+ + setFailedImages((current) => + current.includes(slide.imageUrl) + ? current + : [...current, slide.imageUrl], + ) + } + sizes="100vw" + data-testid="hero-slide" + data-active={index === active ? "true" : "false"} + className={clsx( + styles.image, + index === active ? "opacity-100" : "opacity-0", + )} + /> + {link && index === active ? ( + + ) : null} + {slide.advertisement && !failed && index === active ? ( + + 광고 + + ) : null} +
+ ); + })}
{ - if (event.key === "ArrowLeft" || event.key === "ArrowRight") { + if ( + slides.length > 1 && + (event.key === "ArrowLeft" || event.key === "ArrowRight") + ) { event.preventDefault(); move(event.key === "ArrowLeft" ? -1 : 1); } @@ -65,17 +107,19 @@ export default function HomeHeroCarousel() { > - {activeSlide + 1} - / {heroSlides.length} + {active + 1} + / {slides.length}
diff --git a/src/components/seo/HomeLanding.test.tsx b/src/components/seo/HomeLanding.test.tsx index 43022dc..3eac5d8 100644 --- a/src/components/seo/HomeLanding.test.tsx +++ b/src/components/seo/HomeLanding.test.tsx @@ -2,6 +2,22 @@ import { fireEvent, render, screen, within } from "@testing-library/react"; import HomeLanding from "./HomeLanding"; +jest.mock("@/hooks/useHero", () => ({ + useHero: () => + ["/home-hero-library-v2.png", "/home-hero-winter.png"].map( + (imageUrl, index) => ({ + id: index + 1, + imageUrl, + altText: "메인 이미지", + linkUrl: null, + position: index + 1, + advertisement: false, + startsAt: null, + endsAt: null, + }), + ), +})); + jest.mock("@/app/(main)/home/HomeRankingCards", () => { function HomeRankingCardsMock() { return
; diff --git a/src/hooks/useExperience.test.tsx b/src/hooks/useExperience.test.tsx new file mode 100644 index 0000000..38b76f5 --- /dev/null +++ b/src/hooks/useExperience.test.tsx @@ -0,0 +1,49 @@ +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { act, renderHook } from "@testing-library/react"; +import type { ReactNode } from "react"; + +import { clientAxios } from "@/lib/api/clients"; +import { experienceSummaryFixture } from "@/mocks/data/experience"; + +import { useExperience } from "./useExperience"; + +jest.mock("@/lib/api/clients", () => ({ clientAxios: { get: jest.fn() } })); + +it("refreshes the bidding wallet when another user releases its reservation", async () => { + jest.useFakeTimers(); + const get = jest.mocked(clientAxios.get); + get.mockResolvedValueOnce({ + data: { + success: true, + data: { ...experienceSummaryFixture, reservedXp: 70, availableXp: 0 }, + }, + }); + const client = new QueryClient({ + defaultOptions: { queries: { retry: false } }, + }); + const wrapper = ({ children }: { children: ReactNode }) => ( + {children} + ); + const { result, unmount } = renderHook( + () => useExperience(7, { refetchInterval: 30_000 }), + { wrapper }, + ); + await act(async () => { + await jest.advanceTimersByTimeAsync(1); + }); + expect(result.current.data?.availableXp).toBe(0); + get.mockResolvedValueOnce({ + data: { + success: true, + data: { ...experienceSummaryFixture, reservedXp: 0, availableXp: 70 }, + }, + }); + await act(async () => { + await jest.advanceTimersByTimeAsync(30_001); + }); + expect(result.current.data?.availableXp).toBe(70); + expect(result.current.data?.reservedXp).toBe(0); + unmount(); + client.clear(); + jest.useRealTimers(); +}); diff --git a/src/hooks/useExperience.ts b/src/hooks/useExperience.ts index 572a8f3..882f2f0 100644 --- a/src/hooks/useExperience.ts +++ b/src/hooks/useExperience.ts @@ -9,7 +9,10 @@ import type { ExperienceSummary, } from "@/types/experience"; -export function useExperience(userId: number) { +export function useExperience( + userId: number, + options?: { refetchInterval: number }, +) { return useQuery({ queryKey: ["experience", userId, "summary"], queryFn: async () => { @@ -22,6 +25,8 @@ export function useExperience(userId: number) { return data.data; }, refetchOnMount: "always", + refetchInterval: options?.refetchInterval, + refetchOnWindowFocus: options ? "always" : false, retry: false, }); } diff --git a/src/hooks/useHero.test.tsx b/src/hooks/useHero.test.tsx new file mode 100644 index 0000000..8a3a3ff --- /dev/null +++ b/src/hooks/useHero.test.tsx @@ -0,0 +1,77 @@ +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { act, renderHook } from "@testing-library/react"; +import type { ReactNode } from "react"; + +import { heroRequest } from "@/lib/hero/request"; +import type { HeroResponse } from "@/types/hero"; + +import { useHero } from "./useHero"; + +jest.mock("@/lib/hero/request", () => ({ heroRequest: jest.fn() })); +const request = jest.mocked(heroRequest); +const at = "2026-11-15T15:00:00.000Z"; +const base = { + id: 1, + imageUrl: "/image.png", + altText: "광고", + linkUrl: null, + position: 1, + advertisement: true, + startsAt: null, + endsAt: "2026-11-15T15:00:05.000Z", +}; +function mount(data?: HeroResponse) { + const client = new QueryClient({ + defaultOptions: { queries: { retry: false } }, + }); + if (data) client.setQueryData(["hero", "public"], data); + const wrapper = ({ children }: { children: ReactNode }) => ( + {children} + ); + return { ...renderHook(() => useHero(), { wrapper }), client }; +} +beforeEach(() => { + jest.useFakeTimers(); + jest.setSystemTime(new Date(at)); + request.mockReset(); + request.mockRejectedValue(new Error("offline")); +}); +afterEach(() => { + jest.clearAllTimers(); + jest.useRealTimers(); +}); + +it("expires an advertisement even if the boundary refetch fails", async () => { + const { result } = mount({ + items: [base], + nextChangeAt: base.endsAt, + serverTime: at, + }); + expect(result.current[0].advertisement).toBe(true); + await act(async () => { + jest.advanceTimersByTime(6000); + }); + expect(result.current).toHaveLength(1); + expect(result.current[0].advertisement).toBe(false); + expect(request).toHaveBeenCalledWith("hero"); +}); + +it("preserves second slot and filters future and expired rows", () => { + const { result } = mount({ + items: [ + { ...base, endsAt: at }, + { ...base, id: 2, position: 2, endsAt: null }, + { ...base, id: 3, startsAt: "2026-11-16T00:00:00Z", endsAt: null }, + ], + nextChangeAt: null, + serverTime: at, + }); + expect(result.current.map((slide) => slide.position)).toEqual([1, 2]); + expect(result.current[0].advertisement).toBe(false); +}); + +it("renders one safe default without a successful response", () => { + const { result } = mount(); + expect(result.current).toHaveLength(1); + expect(result.current[0].imageUrl).toBe("/home-hero-library-v2.png"); +}); diff --git a/src/hooks/useHero.ts b/src/hooks/useHero.ts new file mode 100644 index 0000000..1c757ad --- /dev/null +++ b/src/hooks/useHero.ts @@ -0,0 +1,75 @@ +"use client"; + +import { useQuery } from "@tanstack/react-query"; +import { useEffect, useState } from "react"; + +import { heroRequest } from "@/lib/hero/request"; +import type { HeroResponse, HeroSlide } from "@/types/hero"; + +const fallback: HeroSlide = { + id: 0, + imageUrl: "/home-hero-library-v2.png", + altText: "마비노기 정보 검색", + linkUrl: null, + position: 1, + advertisement: false, + startsAt: null, + endsAt: null, +}; + +export function useHero() { + const query = useQuery({ + queryKey: ["hero", "public"], + queryFn: () => heroRequest("hero"), + refetchInterval: 30_000, + refetchOnWindowFocus: "always", + refetchOnReconnect: "always", + retry: false, + }); + const [now, setNow] = useState(Date.now); + const { data, refetch, dataUpdatedAt } = query; + // Advance the server clock locally even when a refresh fails. + const serverNow = data + ? Date.parse(data.serverTime) + Math.max(0, now - dataUpdatedAt) + : now; + useEffect(() => { + const timer = window.setInterval(() => setNow(Date.now()), 1000); + const visible = () => { + if (!document.hidden) { + setNow(Date.now()); + void refetch(); + } + }; + document.addEventListener("visibilitychange", visible); + return () => { + window.clearInterval(timer); + document.removeEventListener("visibilitychange", visible); + }; + }, [refetch]); + useEffect(() => { + if (!data?.nextChangeAt) return; + const delay = + Date.parse(data.nextChangeAt) - + (Date.parse(data.serverTime) + Math.max(0, Date.now() - dataUpdatedAt)); + if (delay <= 0) return; + const timer = window.setTimeout( + () => { + setNow(Date.now()); + void refetch(); + }, + Math.min(delay + 25, 2_147_483_647), + ); + return () => window.clearTimeout(timer); + }, [data, dataUpdatedAt, refetch]); + const items = + data?.items + .filter( + (slide) => + (!slide.startsAt || Date.parse(slide.startsAt) <= serverNow) && + (!slide.endsAt || Date.parse(slide.endsAt) > serverNow), + ) + .slice(0, 10) ?? []; + if (items[0]?.advertisement && items[0].position === 2) + items.unshift(fallback); + return items.length ? items : [fallback]; +} diff --git a/src/lib/api/clients.ts b/src/lib/api/clients.ts index 47615a9..a838842 100644 --- a/src/lib/api/clients.ts +++ b/src/lib/api/clients.ts @@ -7,6 +7,7 @@ import axios, { function isSensitiveAuthRequest(url?: string): boolean { return ( + /^\/(?:user\/|admin\/)?hero(?:$|[/?])/.test(url ?? "") || /^\/(?:admin\/)?guilds(?:$|[/?])/.test(url ?? "") || url === "/user/verification/info" || url === "/auth/oauth/exchange" || diff --git a/src/lib/hero/proxy.test.ts b/src/lib/hero/proxy.test.ts new file mode 100644 index 0000000..15dd0ee --- /dev/null +++ b/src/lib/hero/proxy.test.ts @@ -0,0 +1,90 @@ +import { NextRequest } from "next/server"; + +import { proxyHero } from "./proxy"; + +jest.mock("@/lib/api/gateway-selector", () => ({ + selectServerGatewayUrl: () => "https://gateway.test", +})); +beforeEach(() => { + global.fetch = jest.fn().mockImplementation(() => + Promise.resolve( + new Response('{"success":true,"data":null}', { + headers: { "content-type": "application/json" }, + }), + ), + ); +}); + +it("forwards only Auth access cookie and multipart boundary, never spoofed identity", async () => { + const request = new NextRequest( + "https://www.memonogi.com/api/user/hero/creatives", + { + method: "POST", + headers: { + origin: "https://www.memonogi.com", + "x-hero-action": "1", + cookie: "access_token=member; refresh_token=private", + "content-type": "multipart/form-data; boundary=test", + "x-auth-roles": "ADMIN", + }, + body: "--test", + }, + ); + const response = await proxyHero(request, ["creatives"], "user"); + const [target, init] = jest.mocked(fetch).mock.calls[0]; + expect(String(target)).toBe( + "https://gateway.test/das/api/user/hero/creatives", + ); + const headers = init?.headers as Headers; + expect(headers.get("cookie")).toBe("access_token=member"); + expect(headers.get("content-type")).toContain("boundary=test"); + expect(headers.has("x-auth-roles")).toBe(false); + expect(response.headers.get("cache-control")).toContain("no-store"); +}); + +it.each([ + {}, + { origin: "https://evil.com", "x-hero-action": "1" }, + { origin: "https://www.memonogi.com" }, + { + origin: "https://www.memonogi.com", + "x-hero-action": "1", + "sec-fetch-site": "same-site", + }, +])("rejects cross-origin and ambient-cookie mutations %#", async (headers) => { + const request = new NextRequest( + "https://www.memonogi.com/api/admin/hero/slides", + { method: "POST", headers: headers as HeadersInit }, + ); + expect((await proxyHero(request, ["slides"], "admin")).status).toBe(403); + expect(fetch).not.toHaveBeenCalled(); +}); + +it("public reads do not forward cookies, and invalid paths never reach upstream", async () => { + const request = new NextRequest("https://www.memonogi.com/api/hero", { + headers: { cookie: "access_token=private" }, + }); + expect((await proxyHero(request, [], "public")).status).toBe(200); + expect( + (jest.mocked(fetch).mock.calls[0][1]?.headers as Headers).has("cookie"), + ).toBe(false); + expect((await proxyHero(request, [".."], "public")).status).toBe(400); + expect(fetch).toHaveBeenCalledTimes(1); +}); + +it("rejects login HTML and preserves upstream conflict status", async () => { + jest + .mocked(fetch) + .mockResolvedValueOnce( + new Response("", { headers: { "content-type": "text/html" } }), + ); + const request = new NextRequest("https://www.memonogi.com/api/hero"); + expect((await proxyHero(request, [], "public")).status).toBe(502); + jest.mocked(fetch).mockResolvedValueOnce( + new Response('{"success":false}', { + status: 409, + headers: { "content-type": "application/json" }, + }), + ); + expect((await proxyHero(request, [], "public")).status).toBe(409); +}); diff --git a/src/lib/hero/proxy.ts b/src/lib/hero/proxy.ts new file mode 100644 index 0000000..751ddfb --- /dev/null +++ b/src/lib/hero/proxy.ts @@ -0,0 +1,85 @@ +import { NextRequest, NextResponse } from "next/server"; + +import { selectServerGatewayUrl } from "@/lib/api/gateway-selector"; +import { MEDIA_UPLOAD_TIMEOUT_MS } from "@/lib/api/timeouts"; + +export async function proxyHero( + request: NextRequest, + segments: string[], + scope: "public" | "user" | "admin", +) { + const headers = { + "cache-control": "private, no-store", + "x-content-type-options": "nosniff", + }; + const writes = !["GET", "HEAD"].includes(request.method); + const origin = request.headers.get("origin"); + if ( + writes && + (request.headers.get("x-hero-action") !== "1" || + !origin || + origin !== request.nextUrl.origin || + ["cross-site", "same-site"].includes( + request.headers.get("sec-fetch-site") ?? "", + )) + ) { + return NextResponse.json( + { success: false, message: "광고 화면에서 다시 시도해주세요." }, + { status: 403, headers }, + ); + } + if ( + (scope === "public" && writes) || + segments.some((part) => !/^[a-zA-Z0-9-]+$/.test(part)) + ) { + return NextResponse.json( + { success: false, message: "잘못된 광고 요청입니다." }, + { status: 400, headers }, + ); + } + try { + const prefix = + scope === "public" ? "/das/api/hero" : `/das/api/${scope}/hero`; + const target = new URL( + [prefix, ...segments].join("/"), + selectServerGatewayUrl(), + ); + target.search = request.nextUrl.search; + const upstream = new Headers(); + const token = request.cookies.get("access_token")?.value; + if (scope !== "public" && token) + upstream.set("cookie", `access_token=${token}`); + if (writes) upstream.set("x-hero-action", "1"); + const type = request.headers.get("content-type"); + if (type) upstream.set("content-type", type); + const result = await fetch(target, { + method: request.method, + headers: upstream, + body: writes ? request.body : undefined, + duplex: "half", + redirect: "error", + cache: "no-store", + signal: AbortSignal.timeout(MEDIA_UPLOAD_TIMEOUT_MS), + } as RequestInit & { duplex: "half" }); + if ( + result.status !== 204 && + !result.headers.get("content-type")?.includes("application/json") + ) + return NextResponse.json( + { success: false, message: "광고 서버의 응답을 확인할 수 없습니다." }, + { status: 502, headers }, + ); + return new NextResponse(result.body, { + status: result.status, + headers: { ...headers, "content-type": "application/json" }, + }); + } catch { + return NextResponse.json( + { + success: false, + message: "광고 서버에 연결할 수 없습니다. 잠시 후 다시 시도해주세요.", + }, + { status: 503, headers }, + ); + } +} diff --git a/src/lib/hero/request.ts b/src/lib/hero/request.ts new file mode 100644 index 0000000..3158fa5 --- /dev/null +++ b/src/lib/hero/request.ts @@ -0,0 +1,33 @@ +import { isAxiosError } from "axios"; + +import { clientAxios } from "@/lib/api/clients"; +import { MEDIA_UPLOAD_TIMEOUT_MS } from "@/lib/api/timeouts"; + +export async function heroRequest( + path: string, + method = "GET", + payload?: unknown, +): Promise { + try { + const options = { + url: "/" + path, + method, + data: payload, + headers: method === "GET" ? undefined : { "X-Hero-Action": "1" }, + withCredentials: true, + skipAuthRefresh: path.startsWith("hero") && method === "GET", + ...(payload instanceof FormData + ? { timeout: MEDIA_UPLOAD_TIMEOUT_MS } + : {}), + }; + const { data, status } = await clientAxios.request(options); + if (status === 204) return undefined as T; + if (data?.success !== true) + throw new Error(data?.message || "광고 요청을 처리하지 못했습니다."); + return data.data; + } catch (error) { + if (isAxiosError(error) && error.response?.data?.message) + throw new Error(error.response.data.message); + throw error; + } +} diff --git a/src/lib/hero/validation.test.ts b/src/lib/hero/validation.test.ts new file mode 100644 index 0000000..f8e10ac --- /dev/null +++ b/src/lib/hero/validation.test.ts @@ -0,0 +1,36 @@ +import fixtures from "../../../docs/hero-link-fixtures.json"; +import { + fromKoreanInput, + toKoreanInput, + validateHeroImage, + validateHeroLink, +} from "./validation"; + +it.each(fixtures)("link valid=$valid: $url", ({ url, valid }) => { + if (valid) expect(validateHeroLink(url)).toBe(url || null); + else expect(() => validateHeroLink(url)).toThrow(); +}); + +it("uses Korean time regardless of browser timezone, with optional seconds", () => { + expect(fromKoreanInput("2026-11-15T22:00")).toBe("2026-11-15T13:00:00.000Z"); + expect(fromKoreanInput("2026-11-15T22:00:30")).toBe( + "2026-11-15T13:00:30.000Z", + ); + expect(toKoreanInput("2026-11-15T13:00:00Z")).toBe("2026-11-15T22:00"); +}); + +it("rejects empty, oversized, and unsupported images before decoding", async () => { + await expect( + validateHeroImage(new File([], "x.png", { type: "image/png" })), + ).rejects.toThrow(); + await expect( + validateHeroImage( + new File([new Uint8Array(10 * 1024 * 1024 + 1)], "x.png", { + type: "image/png", + }), + ), + ).rejects.toThrow(); + await expect( + validateHeroImage(new File([""], "x.svg", { type: "image/svg+xml" })), + ).rejects.toThrow(); +}); diff --git a/src/lib/hero/validation.ts b/src/lib/hero/validation.ts new file mode 100644 index 0000000..417187a --- /dev/null +++ b/src/lib/hero/validation.ts @@ -0,0 +1,89 @@ +export function validateHeroLink(value: string): string | null { + if (!value) return null; + if ( + value.length > 2048 || + /\s|\\|[\u0000-\u001f\u007f]/.test(value) || + /%(?![a-f0-9]{2})/i.test(value) + ) + throw new Error( + "링크에 공백, 제어 문자 또는 역슬래시를 사용할 수 없습니다.", + ); + let url: URL; + try { + url = new URL(value); + } catch { + throw new Error("https://로 시작하는 전체 링크를 입력해주세요."); + } + const label = "[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?"; + const authority = /^https:\/\/([^/?#]*)/i.exec(value)?.[1] ?? ""; + if ( + !/^https:\/\//i.test(value) || + url.protocol !== "https:" || + url.username || + url.password || + (url.port && url.port !== "443") || + url.hostname.length > 253 || + !new RegExp(`^(?:${label}\\.)+memonogi\\.com$`, "i").test(url.hostname) || + !new RegExp(`^(?:${label}\\.)+memonogi\\.com(?::443)?$`, "i").test( + authority, + ) + ) + throw new Error("https://*.memonogi.com 링크만 사용할 수 있습니다."); + return value; +} + +export async function validateHeroImage(file: File): Promise { + if (!file.size || file.size > 10 * 1024 * 1024) + throw new Error("이미지는 10 MiB 이하로 등록해주세요."); + if (!["image/jpeg", "image/png"].includes(file.type)) + throw new Error("JPEG 또는 PNG 이미지만 등록할 수 있습니다."); + const bytes = new Uint8Array(await file.slice(0, 8).arrayBuffer()); + const png = [137, 80, 78, 71, 13, 10, 26, 10].every((b, i) => bytes[i] === b); + const jpeg = bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255; + if ( + (file.type === "image/png" && !png) || + (file.type === "image/jpeg" && !jpeg) + ) + throw new Error("이미지의 실제 형식을 확인해주세요."); + const url = URL.createObjectURL(file); + try { + await new Promise((resolve, reject) => { + const image = new Image(); + image.onload = () => { + if ( + !image.naturalWidth || + !image.naturalHeight || + image.naturalWidth * image.naturalHeight > 24_000_000 + ) + reject(new Error("이미지는 2,400만 화소 이하로 등록해주세요.")); + else resolve(); + }; + image.onerror = () => reject(new Error("이미지를 읽을 수 없습니다.")); + image.src = url; + }); + } finally { + URL.revokeObjectURL(url); + } +} + +export function heroTime(value: string | null): string { + return value + ? new Date(value).toLocaleString("ko-KR", { timeZone: "Asia/Seoul" }) + : "제한 없음"; +} + +export function toKoreanInput(value: string | null): string { + return value + ? new Date(Date.parse(value) + 9 * 60 * 60 * 1000) + .toISOString() + .slice(0, 16) + : ""; +} + +export function fromKoreanInput(value: string): string { + return value + ? new Date( + `${value.length === 16 ? value + ":00" : value}+09:00`, + ).toISOString() + : ""; +} diff --git a/src/types/experience.ts b/src/types/experience.ts index 9875803..397292e 100644 --- a/src/types/experience.ts +++ b/src/types/experience.ts @@ -13,6 +13,11 @@ export interface ExperienceSummary { eligible: boolean; activityGrade: ActivityGrade | null; totalXp: number; + currentXp?: number; + spentXp?: number; + reservedXp?: number; + availableXp?: number; + deficitXp?: number; currentGradeMinXp: number; nextGrade: ActivityGrade | null; nextGradeMinXp: number | null; diff --git a/src/types/hero.ts b/src/types/hero.ts new file mode 100644 index 0000000..fbae683 --- /dev/null +++ b/src/types/hero.ts @@ -0,0 +1,65 @@ +export interface HeroSlide { + id: number; + imageUrl: string; + altText: string; + linkUrl: string | null; + position: number; + advertisement: boolean; + startsAt: string | null; + endsAt: string | null; +} + +export interface HeroResponse { + items: HeroSlide[]; + nextChangeAt: string | null; + serverTime: string; +} + +export interface HeroCreative { + id: number; + imageUrl: string; + altText: string; + linkUrl: string | null; + blocked: boolean; + createdAt: string; +} + +export interface HeroAuction { + id: number; + weekStart: string; + slot: number; + status: "OPEN" | "SETTLED" | "CANCELLED"; + opensAt: string; + closesAt: string; + displayStartsAt: string; + displayEndsAt: string; + highestBid: number; + highestBidderId: number | null; + winningBidId: number | null; + reason: string | null; +} + +export interface HeroAuctionsResponse { + auctions: HeroAuction[]; + serverTime: string; + enabled: boolean; +} + +export interface HeroHistory { + bids: Array<{ + id: number; + auctionId: number; + creativeId: number; + amount: number; + status: string; + reason: string | null; + createdAt: string; + }>; + charges: Array<{ + id: number; + auctionId: number; + kind: string; + amount: number; + createdAt: string; + }>; +} From 437a46af951de15102db3f7e0ff9d06cee137099 Mon Sep 17 00:00:00 2001 From: Lee Sanghyun <59863112+dev-ant@users.noreply.github.com> Date: Thu, 12 Nov 2026 13:13:47 +0900 Subject: [PATCH 2/2] test: align workflow contracts with hero release version --- scripts/test-production-workflow.mjs | 2 +- scripts/workflow-contract.test.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test-production-workflow.mjs b/scripts/test-production-workflow.mjs index a6dbc03..93ad81c 100644 --- a/scripts/test-production-workflow.mjs +++ b/scripts/test-production-workflow.mjs @@ -64,7 +64,7 @@ test("production Compose requires the immutable image reference", () => { test("package and lockfile agree on the next release version", () => { const pkg = JSON.parse(read("package.json")); const lock = JSON.parse(read("package-lock.json")); - assert.equal(pkg.version, "1.0.26"); + assert.equal(pkg.version, "1.0.27"); assert.equal(lock.version, pkg.version); assert.equal(lock.packages[""].version, pkg.version); }); diff --git a/scripts/workflow-contract.test.mjs b/scripts/workflow-contract.test.mjs index 756bce6..6d1ed44 100644 --- a/scripts/workflow-contract.test.mjs +++ b/scripts/workflow-contract.test.mjs @@ -68,7 +68,7 @@ test("release version and immutable image contract are fixed", () => { ); const pkg = JSON.parse(read("package.json")); const lock = JSON.parse(read("package-lock.json")); - assert.equal(pkg.version, "1.0.26"); + assert.equal(pkg.version, "1.0.27"); assert.equal(lock.version, pkg.version); assert.equal(lock.packages[""].version, pkg.version); assert.match(
- 누적 경험치에 따른 활동 등급 + 현재 경험치에 따른 활동 등급
- 필요 누적 경험치 + 필요 현재 경험치