Skip to content

Commit a04574e

Browse files
authored
chore :: border에러 수정
chore :: border에러 수정
2 parents b28b858 + 8eb731b commit a04574e

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

src/components/list/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ interface OutAcceptProp {
66
date: string;
77
content: string;
88
onClick: () => void;
9-
type: 'applicationaccept' | 'early-returnaccept' | 'applicationList' | 'early-returnList';
9+
type:
10+
| 'applicationaccept'
11+
| 'early-returnaccept'
12+
| 'applicationList'
13+
| 'early-returnList';
1014
active?: boolean;
1115
}
1216

src/components/list/style.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const OutAcceptWrap = styled.div<AcceptListProp>`
1515
background-color: ${theme.color.main[50]};
1616
border: 2px solid
1717
${({ isActive, type }) =>
18-
isActive && type !== 'early-returnaccept'
18+
isActive && type !== 'early-returnList'
1919
? theme.color.main[500]
2020
: theme.color.main[50]};
2121
cursor: pointer;

src/pages/outList/index.tsx

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,21 @@ const OutList = () => {
9898
/>
9999
))
100100
) : (
101-
<p>외출자 목록이 없습니다</p>
101+
<p>
102+
{currentMenu === 'application' ? '외출' : '조기귀가'} 한 학생이
103+
없습니다
104+
</p>
102105
)
103106
) : earlyreturnListData?.length ? (
104107
earlyreturnListData?.map((item) => (
105-
106-
< OutAcceptList
108+
<OutAcceptList
107109
type={`${currentMenu}List`}
108110
key={item.id}
109111
name={getStudentString(item)}
110112
content={item.reason}
111113
date={item.start.slice(0, 5)}
112114
active={selectedStudents.includes(item.id)}
113-
onClick={() => { }}
115+
onClick={() => {}}
114116
/>
115117
))
116118
) : (
@@ -132,15 +134,17 @@ const OutList = () => {
132134
)}
133135
{modal && (
134136
<Modal
135-
refetchStatus={() => { }}
137+
refetchStatus={() => {}}
136138
type="red"
137-
title={`${selectedStudentName.length > 1
138-
? `${selectedStudentName[0]} 학생 외 ${selectedStudentName.length - 1
139-
}명을 복귀시키겠습니까?`
140-
: selectedStudentName.length === 1
141-
? `${selectedStudentName[0]}을 복귀시키겠습니까?`
142-
: ''
143-
}`}
139+
title={`${
140+
selectedStudentName.length > 1
141+
? `${selectedStudentName[0]} 학생 외 ${
142+
selectedStudentName.length - 1
143+
}명을 복귀시키겠습니까?`
144+
: selectedStudentName.length === 1
145+
? `${selectedStudentName[0]}을 복귀시키겠습니까?`
146+
: ''
147+
}`}
144148
subTitle="복귀 시에는 외출이 끝나게 됩니다."
145149
onCancel={() => {
146150
setModal(false);

0 commit comments

Comments
 (0)