Merge pull request #31 from moyeothon/develop

Deploy
moyeothon · Nov 2, 2024 · a8e5b9e · a8e5b9e
2 parents b3e91db + 30cf8d5
commit a8e5b9e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/components/common/button/Button.tsx b/src/components/common/button/Button.tsx
@@ -41,10 +41,11 @@ const Button: React.FC<ButtonProps> = ({
   const navigate = useNavigate();
   const handleClick = () => {
     if (onClick) {
-      onClick(); // onClick이 존재하면 호출
-    }
-    if (link) {
-      navigate(link);
+      onClick();
+    } else {
+      if (link) {
+        navigate(link);
+      }
     }
   };
 

diff --git a/src/pages/create/Create.tsx b/src/pages/create/Create.tsx
@@ -3,6 +3,7 @@ import Button from "@components/common/button/Button";
 import HintText from "@components/common/hintText/HintText1";
 import TeamButton from "@components/create/TeamButton";
 import { instance } from "@apis/instance";
+import { useNavigate } from "react-router-dom";
 
 const Container = styled.div`
   height: calc(100vh - 80px);
@@ -19,12 +20,14 @@ const ButtonLayout = styled.div`
 `;
 
 const Create: React.FC = () => {
+  const navigate = useNavigate();
   const postData = async () => {
     try {
       const response = await instance.post("/teams/", {
         member_count: localStorage.getItem("member_count"),
       });
       localStorage.setItem("team_id", response.data.team_id);
+      navigate("/login");
     } catch (err) {
       console.log(err);
     }
@@ -41,12 +44,7 @@ const Create: React.FC = () => {
       </Container>
 
       <ButtonLayout>
-        <Button
-          onClick={postData}
-          type="submit"
-          link="/login"
-          name="팀 동기화 시작하기"
-        />
+        <Button onClick={postData} type="submit" name="팀 동기화 시작하기" />
       </ButtonLayout>
     </>
   );

diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx
@@ -6,6 +6,7 @@ import React from "react";
 import styled from "styled-components";
 import Button from "@components/common/button/Button";
 import { instance } from "@apis/instance";
+import { useNavigate } from "react-router-dom";
 
 const Container = styled.div`
   height: calc(100vh - 80px);
@@ -28,6 +29,7 @@ const ButtonLayout = styled.div`
 `;
 
 const Login: React.FC = () => {
+  const navigate = useNavigate();
   const handleNameChange = (data: string) => {
     localStorage.setItem("name", data);
   };
@@ -45,6 +47,7 @@ const Login: React.FC = () => {
           }
         );
         localStorage.setItem("profile_id", response.data.profile_id);
+        navigate(`/invite/${teamID}/${localStorage.getItem("member_count")}`);
       } catch (err) {
         console.log(err);
       }
@@ -73,7 +76,7 @@ const Login: React.FC = () => {
         <Button
           onClick={postData}
           type="submit"
-          link={`/invite/${teamID}/${localStorage.getItem("member_count")}`}
+          // link={}
           name="팀 참가하기"
         />
       </ButtonLayout>