Skip to content

마이페이지 QA - 챌린지 보상 목록 사용 내용 렌더링 #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
begojara99 merged 1 commit into from
Oct 14, 2025
Merged

마이페이지 QA - 챌린지 보상 목록 사용 내용 렌더링 #454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 25 additions & 21 deletions src/APP/user-pages/Mypage/Mypage.mypage.challenge.tuple.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
// import React, { useEffect, useContext } from "react";
// import { useNavigate } from "react-router-dom";
import React from "react";
import * as itemS from "./Styled/Mypage.mypage.challenge.tuple.styles";

export default function ChallengeTuple({ item }) {
// const navigate = useNavigate();

const formatDate = (createdTime) => {
const date = new Date(createdTime);
const year = date.getFullYear();
Expand All @@ -13,8 +10,9 @@ export default function ChallengeTuple({ item }) {
return `${year}.${month}.${day}`;
};

// content가 너무 길 경우를 대비한 함수 (선택적으로 사용)
const truncateTitle = (name) => {
if (name.length > 30) {
if (name && name.length > 30) {
return name.slice(0, 29) + "...";
}
return name;
Expand All @@ -26,24 +24,30 @@ export default function ChallengeTuple({ item }) {

return (
<itemS.TupleContainer data-delete-yn={undefined}>
{/* <itemS.Blank></itemS.Blank> */}
<itemS.TupleStatus>{item.logType}</itemS.TupleStatus>
<itemS.TupleTitleBox>
<itemS.TupleTitle>
{item.problemList?.map((num, idx) => (
<itemS.ProblemBlock key={idx}>
<itemS.ProblemNumber
$index={idx}
onClick={() => moveToDetail(num)}
>
{num} 번
</itemS.ProblemNumber>
{idx !== item.problemList.length - 1 && (
<itemS.Divider>|</itemS.Divider>
)}
</itemS.ProblemBlock>
))}
</itemS.TupleTitle>
{/* ✅ 수정된 부분: logType에 따라 조건부 렌더링 */}
{item.logType === "사용" ? (
// '사용'일 경우 content를 표시
<itemS.TupleTitle>{truncateTitle(item.content)}</itemS.TupleTitle>
) : (
// '획득'일 경우 기존 problemList를 표시
<itemS.TupleTitle>
{item.problemList?.map((num, idx) => (
<itemS.ProblemBlock key={idx}>
<itemS.ProblemNumber
$index={idx}
onClick={() => moveToDetail(num)}
>
{num} 번
</itemS.ProblemNumber>
{idx !== item.problemList.length - 1 && (
<itemS.Divider>|</itemS.Divider>
)}
</itemS.ProblemBlock>
))}
</itemS.TupleTitle>
)}
</itemS.TupleTitleBox>
<itemS.TupleDate>{formatDate(item.logDate)}</itemS.TupleDate>
<itemS.TupleView>{item.rewardCount}회</itemS.TupleView>
Expand Down
Loading