From 4fc689a1e84aed68edd62107f6676856d88a0c20 Mon Sep 17 00:00:00 2001 From: JaeHunKang Date: Thu, 12 Jun 2025 18:29:41 +0900 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=ED=8B=B0=EC=BC=93=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EB=93=9C=EB=9E=98=EA=B7=B8=EC=95=A4=EB=93=9C?= =?UTF-8?q?=EB=9E=8D=20=EC=97=90=EB=9F=AC=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC(=EC=88=AB=EC=9E=90)=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=9C=BC=EB=A1=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/features/ticket/hooks/useTicketOptionDnD.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/ticket/hooks/useTicketOptionDnD.ts b/src/features/ticket/hooks/useTicketOptionDnD.ts index 3f5e68af..8a2ecf7c 100644 --- a/src/features/ticket/hooks/useTicketOptionDnD.ts +++ b/src/features/ticket/hooks/useTicketOptionDnD.ts @@ -30,7 +30,7 @@ export const useTicketOptionDnD = () => { const ticketId = parseInt(destination.droppableId.replace('ticket-', ''), 10); const ticketOptionId = parseInt(result.draggableId, 10); - if (isNaN(ticketId) || isNaN(ticketOptionId)) { + if (!isNaN(ticketId) || !isNaN(ticketOptionId)) { attachOption({ ticketId, ticketOptionId }); } return; From dd139f6463c3a35d8459284a5affe144616e2f3c Mon Sep 17 00:00:00 2001 From: JaeHunKang Date: Fri, 13 Jun 2025 23:59:33 +0900 Subject: [PATCH 02/13] =?UTF-8?q?refact:=20=EB=8C=80=EC=8B=9C=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=ED=8C=90=EB=A7=A4=20=EA=B8=88=EC=95=A1=20=EA=B8=80?= =?UTF-8?q?=EC=94=A8=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widgets/dashboard/ui/main/TicketRevenue.tsx | 2 +- tailwind.config.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/dashboard/ui/main/TicketRevenue.tsx b/src/widgets/dashboard/ui/main/TicketRevenue.tsx index 0d2473d9..e06fc3c9 100644 --- a/src/widgets/dashboard/ui/main/TicketRevenue.tsx +++ b/src/widgets/dashboard/ui/main/TicketRevenue.tsx @@ -10,7 +10,7 @@ const TicketRevenue = ({ icon, title, value }: TicketRevenueProps) => {
{icon}
{title} -

{value}

+

{value}

); diff --git a/tailwind.config.js b/tailwind.config.js index 1c789dd8..eb967878 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -51,6 +51,8 @@ export default { 14: '14px', 15: '15px', 16: '16px', + 17: '17px', + 18: '18px', 19: '19px', 20: '20px', 21: '21px', From a046ef8b7077e50cdc1de9f687066d877cfd698f Mon Sep 17 00:00:00 2001 From: JaeHunKang Date: Sat, 14 Jun 2025 01:59:06 +0900 Subject: [PATCH 03/13] =?UTF-8?q?refact:=20=ED=98=B8=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=AF=B8=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C=20alert=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=EC=97=90=EC=84=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=9E=85=EC=9E=A5=20=EC=8B=9C=20=EB=B6=89=EC=9D=80=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A0=8C=EB=8D=94=EB=A7=81=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/Layout.tsx | 31 ++++++++++++++++--- src/features/event/ui/EventFunnel.tsx | 5 +++ src/main.tsx | 7 ++++- src/pages/event/ui/host/HostSelectionPage.tsx | 31 ++++++++----------- 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/src/app/Layout.tsx b/src/app/Layout.tsx index dcfa0d54..3ea1b7a6 100644 --- a/src/app/Layout.tsx +++ b/src/app/Layout.tsx @@ -1,10 +1,31 @@ +import { useState, useEffect } from 'react'; +import { useLocation } from 'react-router-dom'; + +function HistoryTracker() { + const [myHistory, setMyHistory] = useState([]); + const location = useLocation(); + + useEffect(() => { + setMyHistory(prev => { + const newHistory = [...prev, window.location.href]; + console.log('myHistory :\n', newHistory.join('\n')); + return newHistory; + }); + }, [location]); + + return null; +} + export default function Layout({ children }: { children: React.ReactNode }) { return ( -
-
-
{children}
-
-
+
+
+
+ + {children} +
+
+
); } diff --git a/src/features/event/ui/EventFunnel.tsx b/src/features/event/ui/EventFunnel.tsx index e91bb775..ab972a9f 100644 --- a/src/features/event/ui/EventFunnel.tsx +++ b/src/features/event/ui/EventFunnel.tsx @@ -13,6 +13,7 @@ import { useFunnelState } from '../model/FunnelContext'; import { useEventCreation } from '../hooks/useEventHook'; import { useHostCreation } from '../../host/hook/useHostHook'; import { HostCreationRequest } from '../../host/model/host'; +import { useEffect } from 'react'; const EventFunnel = ({ onNext, onPrev, Funnel, Step, currentStep }: EventFunnelInterface) => { const navigate = useNavigate(); @@ -54,6 +55,10 @@ const EventFunnel = ({ onNext, onPrev, Funnel, Step, currentStep }: EventFunnelI }); }; + useEffect(()=> { + console.log("Current Step Number : ", currentStep); + },[currentStep]) + return ( diff --git a/src/main.tsx b/src/main.tsx index 0fe147fe..e4bfcd02 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -8,7 +8,12 @@ import './index.css'; const queryClient = new QueryClient(); -createRoot(document.getElementById('root')!).render( + + + + +createRoot(document.getElementById('root')!).render( + diff --git a/src/pages/event/ui/host/HostSelectionPage.tsx b/src/pages/event/ui/host/HostSelectionPage.tsx index d2a8f6f2..b3d1e4c4 100644 --- a/src/pages/event/ui/host/HostSelectionPage.tsx +++ b/src/pages/event/ui/host/HostSelectionPage.tsx @@ -50,24 +50,19 @@ const HostSelectionPage = ({ onNext, currentStep, onValidationChange }: HostSele return (
-
{ - if (!isLoggedIn) { - alert('로그인이 필요한 서비스입니다.'); - return; - } - onNext(String(currentStep + 1)); - }} - className="flex justify-start items-center px-3 py-4 cursor-pointer" - > - - 채널 새로 만들기 -
+ {isLoggedIn ? ( + <> + + 채널 새로 만들기 + + ) : ( +

로그인이 필요한 서비스입니다.

+ )} {data?.result.map(host => (
Date: Sat, 14 Jun 2025 02:04:23 +0900 Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=ED=98=B8=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B1=84?= =?UTF-8?q?=EB=84=90=20=EC=83=88=EB=A1=9C=20=EB=A7=8C=EB=93=A4=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20CSS=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/event/ui/host/HostSelectionPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/event/ui/host/HostSelectionPage.tsx b/src/pages/event/ui/host/HostSelectionPage.tsx index b3d1e4c4..898c5607 100644 --- a/src/pages/event/ui/host/HostSelectionPage.tsx +++ b/src/pages/event/ui/host/HostSelectionPage.tsx @@ -51,7 +51,7 @@ const HostSelectionPage = ({ onNext, currentStep, onValidationChange }: HostSele return (
{isLoggedIn ? ( - <> +
채널 새로 만들기 - +
) : (

로그인이 필요한 서비스입니다.

)} From 007eb3094944e1a4c30ce45d53f045091625c691 Mon Sep 17 00:00:00 2001 From: JaeHunKang Date: Sat, 14 Jun 2025 02:18:45 +0900 Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=8F=84=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C=20=EB=8B=A4?= =?UTF-8?q?=EC=9D=8C=20=EB=A1=9C=EC=A7=81=20=EC=8B=A4=ED=96=89=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/event/ui/create-event/FunnelPage.tsx | 5 +++++ src/pages/event/ui/host/HostSelectionPage.tsx | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pages/event/ui/create-event/FunnelPage.tsx b/src/pages/event/ui/create-event/FunnelPage.tsx index 8999a6fc..51eca3ab 100644 --- a/src/pages/event/ui/create-event/FunnelPage.tsx +++ b/src/pages/event/ui/create-event/FunnelPage.tsx @@ -38,6 +38,11 @@ const FunnelPage = () => { } }, [location.search, setStep, steps]); + useEffect(()=>{ + setStep(0); + setPreviousStep([]); + }, []) + return ( {isLoggedIn ? ( -
+
{ + onNext(String(currentStep + 1)); + }} + className="flex justify-start items-center px-3 py-4 cursor-pointer" + > 채널 새로 만들기 From 4b09450ac6f34aaf62c98270229d9530c0f22987 Mon Sep 17 00:00:00 2001 From: JaeHunKang Date: Tue, 17 Jun 2025 22:24:42 +0900 Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=ED=8B=B0=EC=BC=93=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94=EC=99=80=20=ED=8B=B0=EC=BC=93=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EC=95=84=EC=9D=B4=EB=94=94=20=EC=9C=A0=ED=9A=A8?= =?UTF-8?q?=EC=84=B1=20=EC=B2=B4=ED=81=AC=20=ED=95=A8=EC=88=98=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 --- src/features/ticket/hooks/useTicketOptionDnD.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/ticket/hooks/useTicketOptionDnD.ts b/src/features/ticket/hooks/useTicketOptionDnD.ts index 8a2ecf7c..deba6828 100644 --- a/src/features/ticket/hooks/useTicketOptionDnD.ts +++ b/src/features/ticket/hooks/useTicketOptionDnD.ts @@ -30,7 +30,7 @@ export const useTicketOptionDnD = () => { const ticketId = parseInt(destination.droppableId.replace('ticket-', ''), 10); const ticketOptionId = parseInt(result.draggableId, 10); - if (!isNaN(ticketId) || !isNaN(ticketOptionId)) { + if (!isNaN(ticketId) && !isNaN(ticketOptionId)) { attachOption({ ticketId, ticketOptionId }); } return;