Merge pull request #498 from pknu-wap/develop

Release v1.0.2 배포
pknu-wap · Sep 6, 2024 · 95580eb · 95580eb
2 parents 9f1b319 + c3357a8
commit 95580eb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 41 deletions.
diff --git 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)
 <br>
 <br>
 <br>
@@ -22,21 +22,24 @@
 <br>
 
 ### 메인화면
-![메인화면](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)
+
 <br>
 <br>
 

diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -18,7 +18,7 @@ function isChrome() {
 function App() {
   RouteChangeTracker();
   return (
-    <FullLayout>
+
       <AnimatePresence>
         {isChrome() ? (
             <Routes>
@@ -34,7 +34,7 @@ function App() {
         )}
 
       </AnimatePresence>
-    </FullLayout>
+
   );
 }
 

diff --git a/client/src/components/layout/Footer.tsx b/client/src/components/layout/Footer.tsx
@@ -31,17 +31,14 @@ const Footer = ({ dark, toggleDarkMode }: ComponentProps) => {
 
 
   return (
-    <FullLayout>
-      <footer className={`absolute bottom-10 w-full flex justify-between items-center pr-3 pl-3 `}>
-          <div>
-            © WAG!
-          </div>
-          <div>
-            v1.0.1
-          </div>
+      <footer className={`fixed bottom-3 w-full flex justify-between items-center pr-3 pl-3 pb-3`}>
+        <div>
+          © WAG!
+        </div>
+        <div>
+          v1.0.2
+        </div>        
       </footer>
-</FullLayout>
-
   );
 };
 

diff --git 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(
         <RecoilRoot>
           <BrowserRouter>
             <SquareBubble>
+            <FullLayout>
             <Header />
             <App />
             <Footer/>
+            </FullLayout>
             <ToastContainer />
             </SquareBubble>
           </BrowserRouter>

diff --git a/client/src/main/MainPage.tsx b/client/src/main/MainPage.tsx
@@ -164,24 +164,16 @@ function MainPage({ dark }: ComponentProps) {
   return (
     <Wrapper>
     <FullLayout>
-      <div className="sm:mt-0 mt-20">
-        {theme === "light" ? (
-          <div className="flex justify-center items-center">
-            <img className={`relative w-2/4 ${isClicked ? 'clicked' : ''}`} src="images/yangSaeChanGame.png" 
-              alt="logo light mode"
-            >
-
-              </img>
-          </div>
-        ) : (
-          <div className="flex justify-center items-center "> 
-            <img className={`relative w-2/4 ${isClicked ? 'clicked' : ''}`} src="images/yangSaeChanGame.png" 
-              alt="logo light mode"
-          >
-
-              </img>
-          </div>
-        )}
+      <div className="">
+
+        <div className="flex justify-center items-center "> 
+          <img className={`relative w-2/4`} src="images/yangSaeChanGame.png" 
+            alt="logo light mode"
+        >
+
+            </img>
+        </div>
+
 
         <div className="flex flex-col items-center justify-center space-y-5 mt-0">
           <Button size="lg" onClick={handleRandomEnterClick}>