From 2c4731b9d3b9933a8c67bf8ebd6999c28e723b79 Mon Sep 17 00:00:00 2001 From: danggin Date: Wed, 15 Jan 2025 19:15:56 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=E2=9E=96=20remove:=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/testInput/TestInput.tsx | 23 ----------------------- src/pages/testInput/schema.ts | 9 --------- 2 files changed, 32 deletions(-) delete mode 100644 src/pages/testInput/TestInput.tsx delete mode 100644 src/pages/testInput/schema.ts diff --git a/src/pages/testInput/TestInput.tsx b/src/pages/testInput/TestInput.tsx deleted file mode 100644 index 33e518c..0000000 --- a/src/pages/testInput/TestInput.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { FormProvider, useForm } from "react-hook-form"; -import Input from "../../components/ui/input/Input"; -import { IRoomNameSchema } from "./schema"; -import { useCreateRoomMutation } from "../../hooks/useMutation"; - -export function TestInput() { - const methods = useForm(); - const mutation = useCreateRoomMutation(); - const onClickSubmit = async (data: IRoomNameSchema) => { - console.log("방만들기실행"); - const result = mutation.mutate(data); - console.log("방만들기 결과 확인", result); - }; - - return ( - -
- type="text" keyname="roomName" /> - - -
- ); -} diff --git a/src/pages/testInput/schema.ts b/src/pages/testInput/schema.ts deleted file mode 100644 index c65c0f5..0000000 --- a/src/pages/testInput/schema.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { z } from "zod"; - -export const schema = z.object({ - roomName: z.string(), -}); - -export interface IRoomNameSchema { - roomName: string; -} From 9c7dbb498264b2b91b7d99ea2b36f279dd0dbc89 Mon Sep 17 00:00:00 2001 From: danggin Date: Wed, 15 Jan 2025 19:17:28 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=92=A4=20chore:=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home/Home.tsx | 56 +---------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx index 09dc105..02c907f 100644 --- a/src/pages/home/Home.tsx +++ b/src/pages/home/Home.tsx @@ -1,57 +1,3 @@ -import useToast from "@hooks/useToast"; -import { useModal } from "../../hooks/useModal"; - export default function Home() { - const openToast = useToast(); - const { openModal } = useModal(); - - const onClickModal = () => { - openModal("selectDeck", "white"); - }; - - const onClickToast = () => { - openToast("나부터 시작합니다!"); - }; - - const onClickToast2 = () => { - openToast("나부터 시작합니다!"); - }; - - const onClickToast3 = () => { - openToast("나부터 시작합니다!"); - }; - - const onClickToast4 = () => { - openToast("나부터 시작합니다!"); - }; - - return ( - <> -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
- -
- -
- -
- - - ); + return <>Home; } From 440f494a831d59cedd9c557a9520ea063c740b50 Mon Sep 17 00:00:00 2001 From: danggin Date: Wed, 15 Jan 2025 19:20:02 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=90=9B=20fix:=20react-router-dom?= =?UTF-8?q?=EC=9D=98=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20=EC=BB=A8=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=96=EC=97=90=20=EC=9E=88=EB=8D=98=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=AC,=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=97=90=EC=84=9C=20=EB=B6=88=EB=9F=AC=EC=98=A4?= =?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/App.tsx | 7 ------- src/components/layout/layout/Layout.tsx | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index abd038b..0102d9d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,20 +1,13 @@ import "@styles/font.css"; import GlobalStyles from "./styles/GlobalStyle"; -import Modal from "./components/ui/modal/Modal"; -import Toast from "./components/ui/toast/Toast"; import { RouterProvider } from "react-router-dom"; import { router } from "./routes/router"; -import { useModalStore } from "./store/useModalStore"; function App() { - const { showModal } = useModalStore(); - return ( <> - - {showModal && } ); } diff --git a/src/components/layout/layout/Layout.tsx b/src/components/layout/layout/Layout.tsx index 0604215..1f3219c 100644 --- a/src/components/layout/layout/Layout.tsx +++ b/src/components/layout/layout/Layout.tsx @@ -1,12 +1,16 @@ import Header from "@components/layout/header/Header"; import GameRoomHeader from "@components/layout/gameRoomHeader/GameRoomHeader"; import Footer from "@components/layout/footer/Footer"; +import Modal from "@components/ui/modal/Modal"; +import Toast from "@components/ui/toast/Toast"; import { Outlet, useLocation } from "react-router-dom"; import { Wrapper, Container } from "./LayoutStyle"; +import { useModalStore } from "@store/useModalStore"; const HIDDEN_HEADERS = "/game/room/"; export default function Layout() { + const { showModal } = useModalStore(); const location = useLocation(); const pathname = location.pathname; const isHiddenHeader = pathname.includes(HIDDEN_HEADERS); @@ -20,6 +24,9 @@ export default function Layout() {