From cb36a371ce148d70a137930c90a3e7609f1696ee Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 16:39:03 +0900 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20=ED=83=9C=EB=B8=94=EB=A6=BF=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=82=AC=EC=9D=B4=EC=A6=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(home)/page.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx index f222e93e..6145095c 100644 --- a/src/app/(home)/page.tsx +++ b/src/app/(home)/page.tsx @@ -284,7 +284,7 @@ export default function LandingPage() { {/* 텍스트 섹션 - 장식 요소 제거 */} {slides.slice(1).map((_, index) => ( From de053aa3008f533eb9bbe60fc9fa084276be79f9 Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 17:11:08 +0900 Subject: [PATCH 2/7] =?UTF-8?q?chore:=20Lightbox=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=82=AC=EC=A7=84=20=EB=AF=B8=EB=A6=AC=EB=B3=BC=EB=95=8C=20?= =?UTF-8?q?=EC=BB=A4=EC=84=9C=20=EB=B3=B4=EC=9D=B4=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/mouseTrail/CustomCursor.tsx | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/app/components/mouseTrail/CustomCursor.tsx b/src/app/components/mouseTrail/CustomCursor.tsx index cd7a7e54..82a83cc3 100644 --- a/src/app/components/mouseTrail/CustomCursor.tsx +++ b/src/app/components/mouseTrail/CustomCursor.tsx @@ -9,27 +9,45 @@ interface CursorPosition { export default function CustomCursor() { const [position, setPosition] = useState({ x: 0, y: 0 }); + const [isVisible, setIsVisible] = useState(true); useEffect(() => { const updatePosition = (e: MouseEvent) => { setPosition({ x: e.clientX, y: e.clientY }); }; + // Lightbox 요소 감시 + const observer = new MutationObserver((mutations) => { + mutations.forEach((mutation) => { + if (mutation.addedNodes.length) { + const lightbox = document.querySelector('[role="dialog"]'); + if (lightbox) { + setIsVisible(true); + } + } + }); + }); + + observer.observe(document.body, { childList: true, subtree: true }); window.addEventListener("mousemove", updatePosition); return () => { + observer.disconnect(); window.removeEventListener("mousemove", updatePosition); }; }, []); return (
From 4c93eaf31fbff0f506d729ed854bff323a57821e Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 17:11:22 +0900 Subject: [PATCH 3/7] =?UTF-8?q?chore:=20pt-16=20css=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/clientLayout.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/clientLayout.tsx b/src/app/clientLayout.tsx index e5e6e0ce..172c6df5 100644 --- a/src/app/clientLayout.tsx +++ b/src/app/clientLayout.tsx @@ -37,10 +37,12 @@ export default function ClientLayout({ children }: { children: React.ReactNode } const excludePaths = ["/login", "/signup", "/auth/callback"]; const showChannelTalk = !excludePaths.some((path) => pathname.startsWith(path)); const isHome = pathname === "/"; - + const isLogin = pathname === "/login"; + const isSignupA = pathname === "/signup/applicant"; + const isSignupO = pathname === "/signup/owner"; return ( -
+
{children} Date: Thu, 26 Dec 2024 17:19:19 +0900 Subject: [PATCH 4/7] =?UTF-8?q?chore:=20=EB=B9=84=ED=9A=8C=EC=9B=90=20form?= =?UTF-8?q?Action=20=EA=B0=84=EA=B2=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(workform)/apply/[formId]/page.tsx | 2 +- .../work/[formId]/components/FormActions.tsx | 45 ++++++++++--------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/app/(pages)/(workform)/apply/[formId]/page.tsx b/src/app/(pages)/(workform)/apply/[formId]/page.tsx index 4d284a18..ca4787ee 100644 --- a/src/app/(pages)/(workform)/apply/[formId]/page.tsx +++ b/src/app/(pages)/(workform)/apply/[formId]/page.tsx @@ -102,7 +102,7 @@ export default function Apply() { "absolute -bottom-[26px] right-1 text-[13px] text-sm font-medium leading-[22px] text-state-error lg:text-base lg:leading-[26px]"; return ( -
mutation.mutate())}> + mutation.mutate())}> - - }> - 지원하기 +
+
+ + }> + 지원하기 + + + } + onClick={() => + openModal("verifyMyApplication", { + formId, + isOpen: true, + onVerify: handleVerifySuccess, + }) + } + > + 내 지원내역 조회 - - } - onClick={() => - openModal("verifyMyApplication", { - formId, - isOpen: true, - onVerify: handleVerifySuccess, - }) - } - > - 내 지원내역 조회 - +
); } @@ -106,7 +109,7 @@ export default function FormActions({ formId, albaFormDetailData }: FormActionsP if (isOwnerRole) { if (!isMyAlbaForm) return null; return ( -
+
} disabled={isLoading}> {isLoading ? : "수정하기"} @@ -127,7 +130,7 @@ export default function FormActions({ formId, albaFormDetailData }: FormActionsP // 사장님이 아니면 지원하기/내 지원내역 보기 버튼 return ( -
+
{isApplicationLoading ? ( <> From 73b7dc0ce5425f01e74ff11d5a1a624aeb112d7e Mon Sep 17 00:00:00 2001 From: yyezzzy Date: Thu, 26 Dec 2024 17:21:05 +0900 Subject: [PATCH 5/7] =?UTF-8?q?chore:=20scrapBtn=20=EB=B0=B0=EA=B2=BD=20?= =?UTF-8?q?=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/button/default/ScrapBtn.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/button/default/ScrapBtn.tsx b/src/app/components/button/default/ScrapBtn.tsx index a6fa80d7..6cfdab13 100644 --- a/src/app/components/button/default/ScrapBtn.tsx +++ b/src/app/components/button/default/ScrapBtn.tsx @@ -49,7 +49,7 @@ const ScrapBtn = ({ className = "", formId }: ScrapBtnProps) => { return (