Merge pull request #41 from sayyyho/dev

Test: 소켓통신 테스트
KTB-Hackathon-GoLang · Sep 6, 2024 · edfd233 · edfd233
2 parents ad6a800 + e16d848
commit edfd233
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/pages/ChatPage/ChatPage.jsx b/src/pages/ChatPage/ChatPage.jsx
@@ -39,11 +39,7 @@ export const ChatPage = () => {
     if (!username) {
       // 로컬 스토리지에 username이 없으면 로딩 페이지로 이동
       navigate("/");
-      window.addEventListener("storage", (event) => {
-        if (event.key === "username" && event.newValue) {
-          navigate("/chatting/info/another");
-        }
-      });
+      localStorage.setItem("nextpage", "/chatting/info/another");
     } else {
       // username이 이미 있는 경우 소켓 연결 설정
       socketRef.current = io(`${import.meta.env.VITE_BASE_API}/${params.room}`);

diff --git a/src/pages/OnboardingPage/OnboardingPage.4.jsx b/src/pages/OnboardingPage/OnboardingPage.4.jsx
@@ -9,7 +9,11 @@ export const OnboardingPage4 = () => {
   const getUser = async () => {
     await getUserID();
     setTimeout(() => {
-      navigate("/home");
+      if (localStorage.getItem("nextpage")) {
+        navigate(localStorage.getItem("nextpage"));
+      } else {
+        navigate("/home");
+      }
     }, 1000);
   };
   return (

diff --git a/src/pages/SharePage/Share.jsx b/src/pages/SharePage/Share.jsx
@@ -106,6 +106,7 @@ export const Share = () => {
               fontFamily: "Nunito",
               fontSize: "20px",
               fontWeight: 700,
+              textAlign: "center",
             }}
             className="grey-btn"
           >