Skip to content

Commit a02f387

Browse files
wnsdn00dkslel1225
wnsdn00
and
dkslel1225
authored
[๐ŸŽจStyle] 9/3 QA ํ”ผ๋“œ๋ฐฑ ๋ฐ˜์˜ - ๋””์ž์ธ (#209)
* ๋‚ ์งœ ๋นจ๊ฐ„์  ๋ฐ˜์‘ํ˜• ์Šคํƒ€์ผ * ๊ฐ„ํŽธ ๋กœ๊ทธ์ธ ์ฃผ์„ ์ฒ˜๋ฆฌ * sad-laptop ์ด๋ฏธ์ง€ ์œ„์น˜ ์ˆ˜์ •(๋ชจ๋ฐ”์ผ ๊ธฐ์ค€) * font-size ๋ณ€๊ฒฝ * ๋“œ๋กญ๋‹ค์šด ๋‚ด๋ถ€ ์Šคํƒ€์ผ ์ˆ˜์ • --------- Co-authored-by: jyn <71581298+dkslel1225@users.noreply.github.com>
1 parent 6db1536 commit a02f387

6 files changed

Lines changed: 62 additions & 65 deletions

File tree

โ€Žsrc/app/(auth)/login/page.tsxโ€Ž

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Image from 'next/image';
44
import Link from 'next/link';
55

66
import { LoginForm } from '@/features/auth/login/components/LoginForm';
7-
import handleKakaoLogin from '@/features/auth/utils/kakao-login-handler';
87

98
const Login = () => {
109
return (
@@ -31,13 +30,13 @@ const Login = () => {
3130
</p>
3231
</div>
3332

34-
<div className="my-6 flex w-full items-center">
33+
{/* <div className="my-6 flex w-full items-center">
3534
<hr className="border-main flex-1" />
3635
<span className="txt-16-medium text-main mx-4"> OR </span>
3736
<hr className="border-main flex-1" />
38-
</div>
37+
</div> */}
3938

40-
<div className="flex w-full justify-between">
39+
{/* <div className="flex w-full justify-between">
4140
<p className="txt-16-medium text-gray-950">๊ฐ„ํŽธ ๋กœ๊ทธ์ธํ•˜๊ธฐ</p>
4241
<button
4342
type="button"
@@ -51,7 +50,7 @@ const Login = () => {
5150
height={42}
5251
/>
5352
</button>
54-
</div>
53+
</div> */}
5554
</div>
5655
);
5756
};

โ€Žsrc/app/my/reserve-calendar/page.tsxโ€Ž

Lines changed: 48 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ const ReserveCalendarPage = () => {
206206
<p className="txt-14-medium mt-1 text-gray-500">
207207
๋‚ด ์ฒดํ—˜์˜ ๋‚ด์—ญ๋“ค์„ ํ•œ ๋ˆˆ์— ํ™•์ธํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.
208208
</p>
209-
210209
<div className="mt-[1.8rem] md:w-[47.6rem] lg:w-[63.6rem]">
211210
<Dropdown
212211
trigger={
@@ -225,15 +224,15 @@ const ReserveCalendarPage = () => {
225224
<ChevronDown className="mr-[2rem] size-[2rem]" />
226225
</div>
227226
}
228-
dropdownClassName="w-full bg-white shadow-experience-card rounded-[1rem] border border-gray-100 px-[2.6rem]"
227+
dropdownClassName="mt-2 w-full bg-white rounded-xl shadow-experience-card rounded-[1rem] border border-gray-100 px-[2.6rem]"
229228
>
230229
{(close) => (
231230
<ul className="py-3">
232231
{activities.length === 0 && <p>๋“ฑ๋กํ•œ ์ฒดํ—˜์ด ์—†์Šต๋‹ˆ๋‹ค.</p>}
233232
{activities.map((act) => (
234233
<button
235234
key={act.id}
236-
className="txt-13-medium block w-full cursor-pointer py-2 text-left hover:bg-gray-50"
235+
className="txt-13-medium hover:bg-sub w-full cursor-pointer rounded-lg bg-white py-2 text-left transition-all duration-200"
237236
onClick={() => {
238237
handleSelectActivity(act.id, act.title);
239238
close();
@@ -247,56 +246,53 @@ const ReserveCalendarPage = () => {
247246
</Dropdown>
248247
</div>
249248
</div>
250-
251-
<div className="flex gap-8">
252-
<div className="md:w-[47.6rem] lg:w-[63.6rem]">
253-
{selectedActivityId ? (
254-
<CalendarWithReservations
255-
reservationArray={reservationArray}
256-
calendarWidth="w-full md:rounded-[2rem] border border-gray-50 shadow-experience-card"
257-
dayOfWeekStyle="w-[5.35rem] md:w-[6.8rem] lg:w-[9.143rem]"
258-
onCellClick={handleDateClick}
259-
calendarRef={calendarRef}
260-
>
261-
{/* ๋ชจ๋‹ฌ ํˆฌ๋ช… ์˜ค๋ฒ„๋ ˆ์ด - ๋ชจ๋‹ฌ ๋ฐ”๊นฅ ํด๋ฆญ -> closeModal */}
262-
{isDesktop && selectedDate && (
263-
<div
264-
className="fixed inset-0 z-80"
265-
onClick={() => {
266-
resetSelectedDate();
267-
resetDate();
268-
}}
269-
role="presentation"
270-
></div>
271-
)}
272-
{/* ๋ชจ๋‹ฌ ์œ„์น˜ ์ œ์–ดํ•˜๊ธฐ ์œ„ํ•œ div ํƒœ๊ทธ */}
249+
<div className="md:w-[47.6rem] lg:w-[63.6rem]">
250+
{selectedActivityId ? (
251+
<CalendarWithReservations
252+
reservationArray={reservationArray}
253+
calendarWidth="w-full md:rounded-[2rem] border border-gray-50 shadow-experience-card"
254+
dayOfWeekStyle="w-[5.35rem] md:w-[6.8rem] lg:w-[9.143rem]"
255+
onCellClick={handleDateClick}
256+
calendarRef={calendarRef}
257+
>
258+
{/* ๋ชจ๋‹ฌ ํˆฌ๋ช… ์˜ค๋ฒ„๋ ˆ์ด - ๋ชจ๋‹ฌ ๋ฐ”๊นฅ ํด๋ฆญ -> closeModal */}
259+
{isDesktop && selectedDate && (
273260
<div
274-
style={modalPosition}
275-
className={cn(isDesktop && selectedDate && 'z-90')}
276-
>
277-
{/* ์˜ˆ์•ฝ ํ˜„ํ™ฉ ๋ชจ๋‹ฌ */}
278-
<AdaptiveModal extraClassName="shadow-experience-card category-scroll h-[50.8rem] overflow-scroll border border-gray-50 md:h-[39.7rem] lg:h-[44.4rem] lg:w-[32.3rem]">
279-
<div className="p-4">
280-
{selectedReservationsOfDate.length > 0 ? (
281-
<ContentReservation
282-
teamId="15-6"
283-
activityId={Number(selectedActivityId)}
284-
scheduleId={selectedScheduleId}
285-
status={'pending'}
286-
selectedDate={selectedDate || ''}
287-
onStatusChange={updateReservationStatus}
288-
/>
289-
) : (
290-
<EmptyReservation />
291-
)}
292-
</div>
293-
</AdaptiveModal>
294-
</div>
295-
</CalendarWithReservations>
296-
) : (
297-
<NoData message="๋“ฑ๋กํ•œ ์ฒดํ—˜์„ ์„ ํƒํ•ด์ฃผ์„ธ์š”." />
298-
)}
299-
</div>
261+
className="fixed inset-0 z-80"
262+
onClick={() => {
263+
resetSelectedDate();
264+
resetDate();
265+
}}
266+
role="presentation"
267+
></div>
268+
)}
269+
{/* ๋ชจ๋‹ฌ ์œ„์น˜ ์ œ์–ดํ•˜๊ธฐ ์œ„ํ•œ div ํƒœ๊ทธ */}
270+
<div
271+
style={modalPosition}
272+
className={cn(isDesktop && selectedDate && 'z-90')}
273+
>
274+
{/* ์˜ˆ์•ฝ ํ˜„ํ™ฉ ๋ชจ๋‹ฌ */}
275+
<AdaptiveModal extraClassName="shadow-experience-card category-scroll h-[50.8rem] overflow-scroll border border-gray-50 md:h-[39.7rem] lg:h-[44.4rem] lg:w-[32.3rem]">
276+
<div className="p-4">
277+
{selectedReservationsOfDate.length > 0 ? (
278+
<ContentReservation
279+
teamId="15-6"
280+
activityId={Number(selectedActivityId)}
281+
scheduleId={selectedScheduleId}
282+
status={'pending'}
283+
selectedDate={selectedDate || ''}
284+
onStatusChange={updateReservationStatus}
285+
/>
286+
) : (
287+
<EmptyReservation />
288+
)}
289+
</div>
290+
</AdaptiveModal>
291+
</div>
292+
</CalendarWithReservations>
293+
) : (
294+
<NoData message="๋“ฑ๋กํ•œ ์ฒดํ—˜์„ ์„ ํƒํ•ด์ฃผ์„ธ์š”." />
295+
)}
300296
</div>
301297
</div>
302298
);

โ€Žsrc/features/activities/components/search.tsxโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ const Search: React.FC<SearchProps> = ({
7575
'flex w-[20rem] items-center justify-between rounded txt-14-medium text-gray-700 bg-transparent hover:bg-gray-50 cursor-pointer';
7676

7777
const dropdownMenuClass =
78-
'mt-1 w-full bg-white rounded shadow-md txt-14-medium';
78+
'mt-2 w-full bg-white rounded-xl shadow-lg border border-gray-100 p-2 space-y-2 txt-14-medium';
7979

8080
const optionBtnClass =
81-
'w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-blue-50 cursor-pointer';
81+
'w-full px-4 py-3 rounded-lg text-left txt-12-medium bg-white hover:bg-sub cursor-pointer transition-all duration-200';
8282

8383
return (
8484
<div className={style.wrapper}>

โ€Žsrc/features/reservation-state/components/content-reservation.tsxโ€Ž

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,10 @@ export const ContentReservation: React.FC<ContentReservationProps> = ({
268268
</div>
269269
))}
270270
{filteredReservations.length === 0 && (
271-
<p className="text-center text-gray-500">
272-
์„ ํƒํ•œ ์‹œ๊ฐ„๋Œ€์— ํ•ด๋‹น ์ƒํƒœ์˜ ์˜ˆ์•ฝ์ด ์—†์Šต๋‹ˆ๋‹ค.
271+
<p className="txt-16-medium mt-10 text-center text-gray-600">
272+
์„ ํƒํ•œ ์˜ˆ์•ฝ ์‹œ๊ฐ„์—๋Š”
273+
<br />
274+
์‹ ์ฒญ์ค‘์ธ ์˜ˆ์•ฝ ๋‚ด์—ญ์ด ์—†์Šต๋‹ˆ๋‹ค.
273275
</p>
274276
)}
275277
</div>

โ€Žsrc/features/reservation-state/components/empty-reservation.tsxโ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { CalendarDays } from 'lucide-react';
33
const EmptyReservation = () => {
44
return (
55
<div className="flex h-full flex-col items-center text-center">
6-
<CalendarDays className="text-main mt-15 h-12 w-12" />
7-
<h2 className="txt-18-bold mt-20 text-[2rem] text-gray-900">
6+
<CalendarDays className="text-main mt-30 h-12 w-12" />
7+
<h2 className="txt-18-bold mt-10 text-gray-900">
88
ํ•ด๋‹น ๋‚ ์งœ์—๋Š” ์˜ˆ์•ฝ๋‚ด์—ญ์ด ์—†์–ด์š”.
99
</h2>
10-
<p className="txt-16-medium mt-10 text-[1.8rem] text-gray-700">
10+
<p className="txt-16-medium mt-10 text-gray-700">
1111
์˜ˆ์•ฝํ•œ ๋‚ ์งœ๋ฅผ ์„ ํƒํ•˜๋ฉด,
1212
<br />
1313
๋‚ด ์ฒดํ—˜์„ ์˜ˆ์•ฝ ์‹ ์ฒญํ•œ ์‚ฌ๋žŒ๋“ค๊ณผ

โ€Žsrc/shared/components/calendar/components/calendar-with-reservations.tsxโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ const CalendarWithReservations = ({
180180
</div>
181181

182182
{/* โœ… ๋นจ๊ฐ„ ์  ํ‘œ์‹œ - ๋ฐ˜์‘ํ˜• ์Šคํƒ€์ผ ์ถ”๊ฐ€ํ•ด์ฃผ์„ธ์š” */}
183-
<div className="absolute top-[0.9rem] left-[3.39rem] size-[0.4rem] rounded-full bg-red-500" />
183+
<div className="absolute top-[0.9rem] left-[3.39rem] size-[0.4rem] rounded-full bg-red-500 md:left-[3.89rem] lg:left-[5.19rem]" />
184184
</div>
185185
);
186186
})}

0 commit comments

Comments
ย (0)