Skip to content

Commit 42ee7e1

Browse files
committed
⚡ add activity link button
1 parent b308ad3 commit 42ee7e1

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

front/src/components/admin/ClubFundingList/ClubFundingElement.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ export const ClubFundingElement = ({
9898
style={clubId > 0 ? { cursor: "pointer" } : {}}
9999
>
100100
<div className="frame" onClick={handleClick}>
101-
<div className="element">{number}</div>
101+
<div className="element">{type == "two" ? "" : number}</div>
102102
</div>
103103
<div className="div-wrapper" onClick={handleClick}>
104-
<div className="text-wrapper-2">{name}</div>
104+
<div className="text-wrapper-2">{type == "two" ? "총계" : name}</div>
105105
</div>
106106
<div className="frame-2" onClick={handleClick}>
107107
<div className="text-wrapper-2">{expenditureAmount}</div>
@@ -110,12 +110,18 @@ export const ClubFundingElement = ({
110110
<div className="text-wrapper-2">{approvedAmount}</div>
111111
</div>
112112
<div className="frame-3" onClick={handleClick}>
113-
<div className="text-wrapper-2">{feedbackName}</div>
113+
<div className="text-wrapper-2">
114+
{type == "two" ? "" : feedbackName}
115+
</div>
114116
</div>
115117
{type === "zero" ? (
116118
<div className="frame-3">
117119
<div className="text-wrapper-2">{executiveName}</div>
118120
</div>
121+
) : type == "two" ? (
122+
<div className="frame-3">
123+
<div className="text-wrapper-2">{""}</div>
124+
</div>
119125
) : (
120126
<select
121127
value={selectedExecutive}

front/src/pages/admin/ClubFundingList/ClubFundingList.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ export const ClubFundingList = (): JSX.Element => {
8080
feedbackState={funding.feedbackType}
8181
/>
8282
))}
83+
<ClubFundingElement
84+
type="two"
85+
expenditureAmount={`${totalExpenditureAmount}원`}
86+
approvedAmount={`${totalApprovedAmount}원`}
87+
/>
8388
</div>
8489
</div>
8590
</div>

front/src/pages/admin/FundingAdminDetail/FundingAdminDetail.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,20 @@ export const FundingAdminDetail = (): JSX.Element => {
498498
</option>
499499
))}
500500
</select>
501+
{funding.purpose > 0 && (
502+
<button
503+
className="div-3"
504+
style={{ marginLeft: "10px" }}
505+
onClick={() =>
506+
window.open(
507+
`/admin/activity/${funding.purpose}`,
508+
"_blank"
509+
)
510+
}
511+
>
512+
활동 바로가기
513+
</button>
514+
)}
501515
</div>
502516
</p>
503517
<p className="div-3">

0 commit comments

Comments
 (0)