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
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,10 @@ export default function LinkEditPage() {
};

const handleBack = () => {
setShowExitModal(true); // ExitModal을 표시
setShowExitModal(true);
};

const handleExitConfirm = () => {
// 데이터 삭제 후 뒤로가기
localStorage.removeItem("userData");
localStorage.removeItem("formData");
router.push(`/event-maps/${id}`);
Expand All @@ -121,14 +120,14 @@ export default function LinkEditPage() {
<Navigation onBack={handleBack} />

<div
className="flex-1 px-4 mt-[75px] overflow-y-auto"
className="flex-1 px-4 mt-[56px] overflow-y-auto"
style={{
maxHeight: "calc(100vh - 60px)",
paddingBottom: "120px",
}}
>
{userName && (
<div className="text-darkGray text-title-md">
<div className="text-darkGray mt-[16px] text-title-md">
{userName}님의 맵핀 모음이에요
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function BottomSheet() {

return (
<div
className={`fixed bottom-0 left-1/2 transform -translate-x-1/2 w-full h-[556px] bg-[#1d1d1d] rounded-t-[20px] transition-transform z-[1000] duration-700 ${
className={`fixed bottom-0 left-1/2 transform -translate-x-1/2 w-[400px] min-w-[400px] h-[556px] bg-[#1d1d1d] rounded-t-[20px] transition-transform z-[1000] duration-700 ${
isVisible ? "translate-y-0" : "translate-y-full"
}`}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ export default function LinksPage() {
/>
</div>

{/* 바텀 시트 */}
<BottomSheet />
</div>
);
Expand Down
11 changes: 5 additions & 6 deletions fe/src/app/event-maps/[id]/load-mappin/forms/tooltip/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,17 @@ export default function ToolTipPage() {
className="w-full h-screen bg-white flex flex-col items-center"
{...handlers}
>
{/* 고정된 넓이 설정 */}
<div className="w-full max-w-[500px] px-4 mx-auto">
<Navigation />
</div>
<div className="w-full max-w-[500px] px-4 mx-auto mt-16 mb-[48px]">
<div className="w-[360px] px-4 mx-auto mt-16 mb-[48px]">
<h1 className="text-[#2c2c2c] text-[22px] font-semibold font-['Pretendard'] leading-[30px]">
이렇게 공유 버튼이 안 보이나요?
<br />
이렇게 하면 해결 완
</h1>
</div>
<div className="w-full max-w-[500px] px-4 mx-auto mb-[20px]">
<div className="w-fix max-w-[500px] px-4 mx-auto mb-[20px]">
<div className="bg-[#F8F8F8] rounded-xl border border-[#F0F0F0] p-[20px]">
{slides[currentSlide].step && (
<div className="flex items-center gap-2 mb-2">
Expand All @@ -102,11 +101,11 @@ export default function ToolTipPage() {
alt="Example Screenshot"
width={286}
height={286}
className="w-full rounded-xl border border-[#f0f0f0]"
className="w-fix rounded-xl border border-[#f0f0f0]"
/>
</div>
</div>
<div className="w-full max-w-[500px] flex justify-center items-center gap-2 mb-[50px] mx-auto">
<div className="w-fix max-w-[500px] flex justify-center items-center gap-2 mb-[50px] mx-auto">
{slides.map((slide) => (
<div
key={`slide-indicator-${slide.id}`}
Expand All @@ -118,7 +117,7 @@ export default function ToolTipPage() {
/>
))}
</div>
<div className="w-full max-w-[500px] px-4 mx-auto">
<div className="w-fix max-w-[500px] px-4 mx-auto">
<Button
label="네이버 지도 바로 열기"
onClick={() => {
Expand Down
2 changes: 1 addition & 1 deletion fe/src/app/eventcreate-page/components/EventNameInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
cleanString,
isValidLength,
generateDefaultEventName,
} from "../utils/formHelpers";
} from "../utils/formHelpers";

interface EventNameInputProps {
className?: string;
Expand Down
3 changes: 1 addition & 2 deletions fe/src/app/eventcreate-page/location-search/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@ function LocationSearch() {
};
}, [location, debouncedFetch]);

// Focus the input field on component mount
useEffect(() => {
if (inputRef.current) {
inputRef.current.focus(); // Automatically focus on the input field
inputRef.current.focus();
}
}, []);

Expand Down
18 changes: 8 additions & 10 deletions fe/src/app/eventcreate-page/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ function EventCreatePage() {
setIsSubmitting(false);
}
};
useEffect(() => {
setLocation(null); // selectedLocation 초기화
setEventName(""); // eventName 초기화
}, [setLocation]);

useEffect(() => {
if (uuid) router.push(`/event-maps/${uuid}`);
Expand All @@ -64,12 +60,14 @@ function EventCreatePage() {
className="mt-[12px] w-full"
value={selectedLocation?.name || ""}
/>
<EventNameInput
className="mt-[40px] w-full"
value={eventName}
selectedLocation={selectedLocation?.name || ""}
onChange={setEventName}
/>
<div className="relative mt-[40px] w-full">
<EventNameInput
className="w-full"
value={eventName}
selectedLocation={selectedLocation?.name || ""}
onChange={setEventName}
/>
</div>
</div>
<div className="w-full fixed bottom-[45px] left-0 flex justify-center">
<Button
Expand Down