From 18076585795ac67b3e154e5ea1b900f1247d5e47 Mon Sep 17 00:00:00 2001 From: Jang Hong Joon <35947667+wkdghdwns199@users.noreply.github.com> Date: Fri, 6 Sep 2024 02:31:20 +0900 Subject: [PATCH 1/5] Update README.md --- README.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 760b115..a7252e2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # WAG - Web Appends Game -![WAG_preview_image](https://github.com/pknu-wap/WAG/assets/112786665/64917f27-dc03-4d61-bd95-e5740b0c8dab) +![image](https://github.com/user-attachments/assets/808bc148-ddb7-490c-b87a-9ed151981847)


@@ -22,21 +22,24 @@
### 메인화면 -![메인화면](https://github.com/pknu-wap/WAG/assets/111286262/61824ea4-9e32-4497-b247-2071e0e2eaf4) +![메인 화면](https://github.com/user-attachments/assets/5b014b11-e7f6-4a30-9073-de70ed9e24b1) ### 방 생성 -![방 생성](https://github.com/pknu-wap/WAG/assets/111286262/efff8b22-1f66-4274-bacf-c344330523b9) +![방 생성](https://github.com/user-attachments/assets/eae12a7b-dd28-464a-97a7-420c7cc1bac4) ### 게임방 설정 -![방 설정](https://github.com/pknu-wap/WAG/assets/111286262/ab5b5fc8-35ef-47b7-8ac9-836ff7789ae5) +![방 설정](https://github.com/user-attachments/assets/17007b50-ddc3-4c0c-9de5-e0a2787c8bd0) ### 레디 & 시작 -![레디 시작](https://github.com/pknu-wap/WAG/assets/111286262/4e1d93d6-3a99-4bd3-9340-8432c346d077) -### 질문 & 답변 -![질문 답변](https://github.com/pknu-wap/WAG/assets/111286262/d09eac85-2580-415e-b12a-3046ad376ed6) +![게임 준비 시작](https://github.com/user-attachments/assets/7087182e-ecb5-46b8-9438-6b84fe4813b5) +### 질문 +![질문](https://github.com/user-attachments/assets/838a09f6-20ec-4783-9fd8-6bec38836620) ### 경고 -![경고](https://github.com/pknu-wap/WAG/assets/111286262/311edd3c-5634-45fd-85f9-17d3065666d4) -### 정답 & 종료 -![정답 종료](https://github.com/pknu-wap/WAG/assets/111286262/b7216f9a-914a-49f8-826d-c3767a9ab8a3) +![경고주기](https://github.com/user-attachments/assets/b7551bf6-6ffb-4a62-9ae2-0e453959a0ce) +### 정답 +![정답](https://github.com/user-attachments/assets/f8645d17-27c4-4c5c-a4e6-d4ad2b61e53d) +### 종료 +![종료](https://github.com/user-attachments/assets/c63dea14-d8c4-4b1c-99f7-131ff10c62d2) ### 재시작 -![재시작](https://github.com/pknu-wap/WAG/assets/111286262/4da3e394-e0be-4fdc-ac3c-7b86008fea7b) +![재시작](https://github.com/user-attachments/assets/fc1efc09-f976-495b-9710-ca904532e849) +

From ae44f05ddc11ce0ef93af253178e9c946f651816 Mon Sep 17 00:00:00 2001 From: wkdghdwns199 Date: Fri, 6 Sep 2024 17:35:28 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix=20:=20Footer=20=EB=8B=A4=ED=81=AC=20?= =?UTF-8?q?=ED=85=8C=EB=A7=88=20=EC=A0=81=EC=9A=A9=20=EB=B6=88=EA=B0=80?= =?UTF-8?q?=EB=A1=9C=20FullLayout=20=ED=83=9C=EA=B7=B8=EB=A5=BC=20?= =?UTF-8?q?=EC=83=81=EC=9C=84=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/App.tsx | 4 ++-- client/src/index.tsx | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/src/App.tsx b/client/src/App.tsx index d947c41..08bb0cb 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -18,7 +18,7 @@ function isChrome() { function App() { RouteChangeTracker(); return ( - + {isChrome() ? ( @@ -34,7 +34,7 @@ function App() { )} - + ); } diff --git a/client/src/index.tsx b/client/src/index.tsx index 0637067..ddbf27d 100644 --- a/client/src/index.tsx +++ b/client/src/index.tsx @@ -14,6 +14,7 @@ import { ToastContainer } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; import SquareBubble from "./components/layout/SquareBubble"; import Footer from "./components/layout/Footer"; +import FullLayout from "./components/layout/FullLayout"; const queryClient = new QueryClient(); const rootElement = document.getElementById("root") as HTMLElement; // id가 'root'인 엘리먼트를 찾는 코드를 변수에 할당 @@ -26,9 +27,11 @@ root.render( +