Merge pull request #72 from Teammanagers/develop

이슈 수정
Teammanagers · Aug 23, 2024 · e0cff94 · e0cff94
2 parents 820dda5 + 24357cc
commit e0cff94
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/components/login/Login.tsx b/src/components/login/Login.tsx
@@ -4,10 +4,11 @@ import KakaoLogo from '@assets/login/kakao-logo.svg';
 import NaverLogo from '@assets/login/naver-logo.svg';
 import GoogleLogo from '@assets/login/google-logo.svg';
 import { useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 
 const Login = () => {
   const navigate = useNavigate();
+  const location = useLocation();
   const [isRouteByEvent, setIsRouteByEvent] = useState<boolean>(false);
   const handleKakaoButtonClick = () => {
     window.location.href =
@@ -31,14 +32,14 @@ const Login = () => {
     const token = localStorage.getItem('accessToken');
     const isNewUser = !!localStorage.getItem('isNewUser');
 
-    if (token && isNewUser) {
+    if (token && !!isNewUser) {
       navigate('/signup');
     }
 
     if (token && !isNewUser) {
       navigate('/team');
     }
-  }, [isRouteByEvent]);
+  }, [isRouteByEvent, location]);
 
   return (
     <OnBoardingTextDiv>

diff --git a/src/components/sidebar/SideBar.tsx b/src/components/sidebar/SideBar.tsx
@@ -34,7 +34,8 @@ export const SideBar = () => {
   const navigate = useNavigate();
   const location = useLocation();
 
-  const { result } = useGetAlarmList(Number(localStorage.getItem('teamId')));
+  const teamId = Number(localStorage.getItem('teamId'));
+  const { result } = teamId && useGetAlarmList(teamId);
 
   const handleNavigate = (path: string) => {
     navigate(path);

diff --git a/src/hooks/team/useCreateTeam.ts b/src/hooks/team/useCreateTeam.ts
@@ -10,9 +10,8 @@ export const useCreateTeam = (): UseMutationResult<
 > => {
   const navigate = useNavigate();
   const mutation = useMutation({
-    mutationFn: createTeam, // 올바른 함수 전달
+    mutationFn: createTeam,
     onSuccess: (data) => {
-      console.log(data.result, 'ㅎㅇ');
       navigate('/team/share', {
         state: {
           teamCode: data.result.teamCode,