Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/app/(app)/spontaneous/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default function SpontaneousStartPage() {
>
<ChevronLeft size={34} strokeWidth={2.4} />
</button>
<h1 className="relative z-10 ml-2 text-[1.75rem] font-bold tracking-[-0.04em] text-[#0b1d43]">
<h1 className="relative z-10 ml-2 text-[1.5rem] font-extrabold tracking-[-0.045em] text-[#0b2146]">
제로플랜
</h1>
</header>
Expand Down
8 changes: 4 additions & 4 deletions src/components/map/IntroScene2.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
.branding h1 {
margin: clamp(0.7rem, 1.8dvh, 1.1rem) 0 0;
color: #061b43;
font-size: clamp(1.75rem, 7vw, 2.45rem);
font-size: clamp(1.6rem, 6.3vw, 2.2rem);
font-weight: 900;
line-height: 1.15;
letter-spacing: -0.065em;
Expand Down Expand Up @@ -313,7 +313,7 @@
.loginSheet h2 {
margin: clamp(0.55rem, 1.4dvh, 0.9rem) 0 clamp(0.85rem, 2dvh, 1.2rem);
color: #071c44;
font-size: clamp(1.25rem, 5.4vw, 1.72rem);
font-size: clamp(1.15rem, 4.8vw, 1.5rem);
font-weight: 900;
line-height: 1.28;
letter-spacing: -0.055em;
Expand Down Expand Up @@ -446,7 +446,7 @@

.branding h1 {
margin-top: 0.45rem;
font-size: 1.55rem;
font-size: 1.45rem;
}

.branding p {
Expand Down Expand Up @@ -474,7 +474,7 @@

.loginSheet h2 {
margin-block: 0.35rem 0.65rem;
font-size: 1.15rem;
font-size: 1.05rem;
}

.googleButton {
Expand Down
18 changes: 3 additions & 15 deletions src/components/trip/QuestionStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,15 @@ function AnswerGroup({
type="button"
disabled={atMax}
onClick={() => onToggle(a.id)}
className={`flex min-h-[5.25rem] flex-col items-center justify-center gap-2 rounded-[1.2rem] border p-3 text-center text-sm font-bold transition-all ${
className={`flex min-h-[6.25rem] flex-col items-center justify-center gap-2.5 rounded-[1.2rem] border p-3 text-center text-sm font-bold transition-all ${
on
? "border-2 border-[#2f7ff2] bg-[#edf6ff] text-[#2376e9] shadow-[0_8px_18px_rgba(47,127,242,0.08)]"
: atMax
? "cursor-not-allowed border-[#e6eaf0] bg-[#fafbfc] text-[#c5ccd7]"
: "border-[#d7e0ec] bg-white text-[#14294d] hover:border-[#a9cafa]"
}`}
>
<Icon size={29} strokeWidth={1.8} aria-hidden />
<Icon size={32} strokeWidth={1.8} aria-hidden />
{a.label}
</button>
);
Expand Down Expand Up @@ -295,18 +295,6 @@ export default function QuestionStep({
)}
</section>

{uiStep === 1 && (
<div className="mb-7 flex items-center gap-4 rounded-[1.25rem] bg-[#edf6ff] px-5 py-4 text-[#0e2d5b]">
<UsersRound className="shrink-0 text-[#2f7ff2]" size={42} strokeWidth={1.7} aria-hidden />
<div>
<p className="text-[0.98rem] font-extrabold tracking-[-0.03em]">
누구와 떠나시든, 좋아하는 스타일에 맞춰
</p>
<p className="mt-1 text-sm font-medium text-[#6f8099]">딱 맞는 코스를 추천해드려요.</p>
</div>
</div>
)}

{error && (
<p className="mb-6 rounded-2xl bg-red-50 px-4 py-3 text-sm text-[#F16E5E]">
질문을 불러오지 못했어요. 잠시 후 다시 시도해 주세요.
Expand All @@ -319,7 +307,7 @@ export default function QuestionStep({
</div>
)}

<div className={`flex flex-col ${uiStep === 1 ? "gap-7" : "gap-8"}`}>
<div className="flex flex-col gap-8">
{stepQuestions.map((q) => {
const multiple = q.type === "MULTIPLE_CHOICE";
const selectedIds = selectedIdsFor(q);
Expand Down
65 changes: 34 additions & 31 deletions src/components/trip/ScheduleDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,37 +87,40 @@ export default function ScheduleDetail({ scheduleId }: { scheduleId: string }) {

const places = useMemo<ScheduleCoursePlace[]>(
() =>
day?.stops.map((stop) => {
const marker = mapData?.markers.find(
(item) =>
item.dayNo === day.dayNo &&
(item.placeId === stop.place.id || item.order === stop.order),
);
return {
id: stop.id,
placeId: stop.place.id,
order: stop.order,
latitude:
finiteCoordinate(marker?.latitude) ?? finiteCoordinate(stop.place.latitude),
longitude:
finiteCoordinate(marker?.longitude) ?? finiteCoordinate(stop.place.longitude),
imageUrl: stop.place.primaryImageUrl ?? null,
arrivalTime: formatCourseTime(stop.arriveAtDateTime ?? stop.arriveAt),
title: stop.place.name,
categoryLabel:
stop.place.categoryLabel || placeCategoryLabel(stop.place.category),
stayMinutes: stop.stayMinutes,
inboundTransit: stop.inboundTransit,
mealLabel:
stop.mealTimeSlot === "LUNCH"
? "점심 추천"
: stop.mealTimeSlot === "DINNER"
? "저녁 추천"
: null,
waitingMinutesBefore: stop.waitingMinutesBefore,
warnings: stop.warnings ?? [],
};
}) ?? [],
[...(day?.stops ?? [])]
.sort((left, right) => left.order - right.order)
.map((stop) => {
const dayMarkers = mapData?.markers.filter(
(item) => item.dayNo === day?.dayNo,
);
const marker =
dayMarkers?.find((item) => item.placeId === stop.place.id) ??
dayMarkers?.find((item) => item.order === stop.order);
return {
id: stop.id,
placeId: stop.place.id,
order: stop.order,
latitude:
finiteCoordinate(marker?.latitude) ?? finiteCoordinate(stop.place.latitude),
longitude:
finiteCoordinate(marker?.longitude) ?? finiteCoordinate(stop.place.longitude),
imageUrl: stop.place.primaryImageUrl ?? null,
arrivalTime: formatCourseTime(stop.arriveAtDateTime ?? stop.arriveAt),
title: stop.place.name,
categoryLabel:
stop.place.categoryLabel || placeCategoryLabel(stop.place.category),
stayMinutes: stop.stayMinutes,
inboundTransit: stop.inboundTransit,
mealLabel:
stop.mealTimeSlot === "LUNCH"
? "점심 추천"
: stop.mealTimeSlot === "DINNER"
? "저녁 추천"
: null,
waitingMinutesBefore: stop.waitingMinutesBefore,
warnings: stop.warnings ?? [],
};
}),
[day, mapData?.markers],
);

Expand Down
Loading