Skip to content

Commit 9ffd19b

Browse files
BlueHorn07BlueHorn07
committed
npm run format
1 parent d482344 commit 9ffd19b

File tree

5 files changed

+160
-164
lines changed

5 files changed

+160
-164
lines changed

‎components/equipment/equipment.reservation.table2.jsx‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,36 @@ const EquipmentReservationTable2 = ({ reservations, startIdx }) => {
1818
</Table.Header>
1919
<Table.Body>
2020
{reservations.map((reservation, idx) => (
21-
<Table.Row key={reservation.uuid}>
22-
<Table.Cell>{startIdx + idx + 1}</Table.Cell>
23-
<Table.Cell>
24-
{reservation.equipments.map((equipment) => {
25-
return (
26-
<Label
27-
size={'tiny'}
28-
key={equipment.uuid}
29-
style={{ margin: '2px' }}
30-
>
31-
{equipment.name}
32-
</Label>
33-
);
34-
})}
35-
</Table.Cell>
36-
<Table.Cell>{reservation.title}</Table.Cell>
37-
<Table.Cell>{reservation.description}</Table.Cell>
38-
<Table.Cell>
39-
<b>
40-
{moment(reservation.date, 'YYYYMMDD').format(
41-
'YYYY년 MM월 DD일',
42-
)}
43-
<br />
44-
{moment(reservation.start_time, 'HHmm').format('HH:mm')}
45-
&nbsp;~&nbsp;
46-
{moment(reservation.end_time, 'HHmm').format('HH:mm')}
47-
</b>
48-
</Table.Cell>
49-
<Table.Cell>{reservation.status}</Table.Cell>
50-
</Table.Row>
21+
<Table.Row key={reservation.uuid}>
22+
<Table.Cell>{startIdx + idx + 1}</Table.Cell>
23+
<Table.Cell>
24+
{reservation.equipments.map((equipment) => {
25+
return (
26+
<Label
27+
size={'tiny'}
28+
key={equipment.uuid}
29+
style={{ margin: '2px' }}
30+
>
31+
{equipment.name}
32+
</Label>
33+
);
34+
})}
35+
</Table.Cell>
36+
<Table.Cell>{reservation.title}</Table.Cell>
37+
<Table.Cell>{reservation.description}</Table.Cell>
38+
<Table.Cell>
39+
<b>
40+
{moment(reservation.date, 'YYYYMMDD').format(
41+
'YYYY년 MM월 DD일',
42+
)}
43+
<br />
44+
{moment(reservation.start_time, 'HHmm').format('HH:mm')}
45+
&nbsp;~&nbsp;
46+
{moment(reservation.end_time, 'HHmm').format('HH:mm')}
47+
</b>
48+
</Table.Cell>
49+
<Table.Cell>{reservation.status}</Table.Cell>
50+
</Table.Row>
5151
))}
5252
</Table.Body>
5353
</Table>

‎components/place/place.reservation.table2.jsx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ const PlaceReservationTable2 = ({ reservations, startIdx }) => {
1818
</Table.Header>
1919
<Table.Body>
2020
{reservations.map((reservation, idx) => (
21-
<Table.Row key={reservation.uuid}>
22-
<Table.Cell>{startIdx + idx + 1}</Table.Cell>
23-
<Table.Cell>{reservation.place.name}</Table.Cell>
24-
<Table.Cell>{reservation.title}</Table.Cell>
25-
<Table.Cell>{reservation.description}</Table.Cell>
26-
<Table.Cell>
27-
<b>
28-
{moment(reservation.date, 'YYYYMMDD').format(
29-
'YYYY년 MM월 DD일',
30-
)}
31-
<br />
32-
{moment(reservation.start_time, 'HHmm').format('HH:mm')}
33-
&nbsp;~&nbsp;
34-
{moment(reservation.end_time, 'HHmm').format('HH:mm')}
35-
</b>
36-
</Table.Cell>
37-
<Table.Cell>{reservation.status}</Table.Cell>
38-
</Table.Row>
21+
<Table.Row key={reservation.uuid}>
22+
<Table.Cell>{startIdx + idx + 1}</Table.Cell>
23+
<Table.Cell>{reservation.place.name}</Table.Cell>
24+
<Table.Cell>{reservation.title}</Table.Cell>
25+
<Table.Cell>{reservation.description}</Table.Cell>
26+
<Table.Cell>
27+
<b>
28+
{moment(reservation.date, 'YYYYMMDD').format(
29+
'YYYY년 MM월 DD일',
30+
)}
31+
<br />
32+
{moment(reservation.start_time, 'HHmm').format('HH:mm')}
33+
&nbsp;~&nbsp;
34+
{moment(reservation.end_time, 'HHmm').format('HH:mm')}
35+
</b>
36+
</Table.Cell>
37+
<Table.Cell>{reservation.status}</Table.Cell>
38+
</Table.Row>
3939
))}
4040
</Table.Body>
4141
</Table>

‎components/user/user.table.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const UserTable = ({ users, startIdx }) => {
4545
</Link>
4646
</Table.Cell>
4747
</Table.Row>
48-
)
48+
);
4949
})}
5050
</Table.Body>
5151
</Table>

‎pages/place/reservation/create.jsx‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,15 @@ const PlaceReservationCreatePage = ({ placeList }) => {
199199
</p>
200200
</Message>
201201

202-
{
203-
isPossible ? (
204-
<Message negative>
205-
선택하신 시간 대는 예약이 불가능한 시간대로 설정 되어 있습니다.
206-
다만, 관리자 화면에서는 강제로 {placeInfo.name}에 대한 예약을 진행할 수 있습니다.
207-
계속 진행하시겠습니까?
208-
</Message>
209-
) : null
210-
}
211-
212-
<Form.Button onClick={handleSubmit}>
213-
생성
214-
</Form.Button>
202+
{isPossible ? (
203+
<Message negative>
204+
선택하신 시간 대는 예약이 불가능한 시간대로 설정 되어 있습니다.
205+
다만, 관리자 화면에서는 강제로 {placeInfo.name}에 대한 예약을
206+
진행할 수 있습니다. 계속 진행하시겠습니까?
207+
</Message>
208+
) : null}
209+
210+
<Form.Button onClick={handleSubmit}>생성</Form.Button>
215211
</>
216212
) : null}
217213
</Form>

‎pages/user/[uuid].jsx‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import PlaceReservationTable2 from '@/components/place/place.reservation.table2'
88
import DeleteConfirmModal from '@/components/common/delete.confirm.modal';
99
import { useRouter } from 'next/router';
1010

11-
1211
const userTypeOptions = [
1312
{ key: 'STUDENT', text: '학생', value: 'STUDENT' },
1413
{ key: 'RC_STUDENT', text: 'RC 학부생', value: 'RC_STUDENT' },
@@ -26,11 +25,7 @@ const userStatusOptions = [
2625
{ key: 'BANNED', text: 'BANNED', value: 'BANNED' },
2726
];
2827

29-
const UserDetailPage = ({
30-
user,
31-
placeReservations,
32-
equipReservations,
33-
}) => {
28+
const UserDetailPage = ({ user, placeReservations, equipReservations }) => {
3429
const [deleteModalOpen, setDeleteModalOpen] = useState(false);
3530

3631
const [email, setEmail] = useState(user.email);
@@ -65,104 +60,109 @@ const UserDetailPage = ({
6560
<LayoutWithAuth>
6661
<h2>유저 세부 정보</h2>
6762

68-
<div style={{marginBottom: '1rem'}}>
63+
<div style={{ marginBottom: '1rem' }}>
6964
<Button onClick={() => window.history.back()}>뒤로가기</Button>
7065
</div>
7166

72-
<Tab panes={[
73-
{
74-
menuItem: '유저 정보',
75-
render: () => (
76-
<Tab.Pane>
77-
<h3>유저 정보</h3>
78-
79-
<Form>
80-
<Form.Field>
81-
<label>UUID</label>
82-
<p>{user.uuid}</p>
83-
</Form.Field>
84-
<Form.Input
85-
required
86-
label={'email'}
87-
value={email}
88-
onChange={(e) => setEmail(e.target.value)}
89-
/>
90-
<Form.Input
91-
required
92-
label={'이름'}
93-
value={name}
94-
onChange={(e) => setName(e.target.value)}
95-
/>
96-
<Form.Select
97-
required
98-
label={'유저 타입'}
99-
placeholder="유저 타입을 선택하세요."
100-
value={userType}
101-
options={userTypeOptions}
102-
onChange={(e, { value }) => setUserType(value)}
103-
/>
104-
<Form.Select
105-
required
106-
label={'유저 상태'}
107-
placeholder="유저 상태를 선택하세요."
108-
value={userStatus}
109-
options={userStatusOptions}
110-
onChange={(e, { value }) => setUserStatus(value)}
111-
/>
112-
<Form.Group style={{display: 'flex'}}>
113-
<Form.Field style={{flex: 1}}>
114-
<label>생성일</label>
115-
<p>{user.createdAt}</p>
116-
</Form.Field>
117-
<Form.Field style={{flex: 1}}>
118-
<label>마지막 로그인</label>
119-
<p>{user.lastLoginAt}</p>
67+
<Tab
68+
panes={[
69+
{
70+
menuItem: '유저 정보',
71+
render: () => (
72+
<Tab.Pane>
73+
<h3>유저 정보</h3>
74+
75+
<Form>
76+
<Form.Field>
77+
<label>UUID</label>
78+
<p>{user.uuid}</p>
12079
</Form.Field>
121-
</Form.Group>
122-
<Form.Group>
123-
<Form.Button type="submit" onClick={handleSubmit}>
124-
수정
125-
</Form.Button>
126-
<DeleteConfirmModal
127-
open={deleteModalOpen}
128-
target={`${name}(${email})`}
129-
deleteURI={`user/${user.uuid}`}
130-
trigger={
131-
<Button negative onClick={() => setDeleteModalOpen(true)}>
132-
삭제
133-
</Button>
134-
}
80+
<Form.Input
81+
required
82+
label={'email'}
83+
value={email}
84+
onChange={(e) => setEmail(e.target.value)}
13585
/>
136-
</Form.Group>
137-
</Form>
138-
</Tab.Pane>
139-
),
140-
},
141-
{
142-
menuItem: `장소 예약 목록 (${placeReservations.length}개)`,
143-
render: () => (
144-
<Tab.Pane>
145-
<h3>장소 예약 목록 ({placeReservations.length}개)</h3>
146-
<PlaceReservationTable2
147-
reservations={placeReservations}
148-
startIdx={1}
149-
/>
150-
</Tab.Pane>
151-
),
152-
},
153-
{
154-
menuItem: `장비 예약 목록 (${equipReservations.length}개)`,
155-
render: () => (
156-
<Tab.Pane>
157-
<h3>장비 예약 목록 ({equipReservations.length}개)</h3>
158-
<EquipmentReservationTable2
159-
reservations={equipReservations}
160-
startIdx={1}
161-
/>
162-
</Tab.Pane>
163-
),
164-
}
165-
]}/>
86+
<Form.Input
87+
required
88+
label={'이름'}
89+
value={name}
90+
onChange={(e) => setName(e.target.value)}
91+
/>
92+
<Form.Select
93+
required
94+
label={'유저 타입'}
95+
placeholder="유저 타입을 선택하세요."
96+
value={userType}
97+
options={userTypeOptions}
98+
onChange={(e, { value }) => setUserType(value)}
99+
/>
100+
<Form.Select
101+
required
102+
label={'유저 상태'}
103+
placeholder="유저 상태를 선택하세요."
104+
value={userStatus}
105+
options={userStatusOptions}
106+
onChange={(e, { value }) => setUserStatus(value)}
107+
/>
108+
<Form.Group style={{ display: 'flex' }}>
109+
<Form.Field style={{ flex: 1 }}>
110+
<label>생성일</label>
111+
<p>{user.createdAt}</p>
112+
</Form.Field>
113+
<Form.Field style={{ flex: 1 }}>
114+
<label>마지막 로그인</label>
115+
<p>{user.lastLoginAt}</p>
116+
</Form.Field>
117+
</Form.Group>
118+
<Form.Group>
119+
<Form.Button type="submit" onClick={handleSubmit}>
120+
수정
121+
</Form.Button>
122+
<DeleteConfirmModal
123+
open={deleteModalOpen}
124+
target={`${name}(${email})`}
125+
deleteURI={`user/${user.uuid}`}
126+
trigger={
127+
<Button
128+
negative
129+
onClick={() => setDeleteModalOpen(true)}
130+
>
131+
삭제
132+
</Button>
133+
}
134+
/>
135+
</Form.Group>
136+
</Form>
137+
</Tab.Pane>
138+
),
139+
},
140+
{
141+
menuItem: `장소 예약 목록 (${placeReservations.length}개)`,
142+
render: () => (
143+
<Tab.Pane>
144+
<h3>장소 예약 목록 ({placeReservations.length}개)</h3>
145+
<PlaceReservationTable2
146+
reservations={placeReservations}
147+
startIdx={1}
148+
/>
149+
</Tab.Pane>
150+
),
151+
},
152+
{
153+
menuItem: `장비 예약 목록 (${equipReservations.length}개)`,
154+
render: () => (
155+
<Tab.Pane>
156+
<h3>장비 예약 목록 ({equipReservations.length}개)</h3>
157+
<EquipmentReservationTable2
158+
reservations={equipReservations}
159+
startIdx={1}
160+
/>
161+
</Tab.Pane>
162+
),
163+
},
164+
]}
165+
/>
166166
</LayoutWithAuth>
167167
);
168168
};
@@ -177,17 +177,17 @@ export async function getServerSideProps(ctx) {
177177

178178
const res2 = await PoPoAxios.get(`reservation-place/user/admin/${uuid}`, {
179179
withCredentials: true,
180-
})
180+
});
181181

182182
const res3 = await PoPoAxios.get(`reservation-equip/user/admin/${uuid}`, {
183183
withCredentials: true,
184-
})
184+
});
185185

186186
return {
187187
props: {
188188
user: res1.data,
189189
placeReservations: res2.data,
190190
equipReservations: res3.data,
191191
},
192-
}
192+
};
193193
}

0 commit comments

Comments
 (0)