Merge pull request #70 from Teammanagers/develop

이슈 수정
Teammanagers · Aug 23, 2024 · 820dda5 · 820dda5
2 parents e247fcb + 8fe9f32
commit 820dda5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/src/apis/Axios.ts b/src/apis/Axios.ts
@@ -3,6 +3,6 @@ import axios from 'axios';
 export const Axios = axios.create({
   baseURL: import.meta.env.VITE_BASE_URL,
   headers: {
-    Authorization: `Bearer ` + import.meta.env.VITE_API_TOKEN
+    Authorization: `Bearer ` + localStorage.getItem('accessToken')
   }
 });
diff --git a/src/apis/alarm/getAlarmList.ts b/src/apis/alarm/getAlarmList.ts
@@ -1,7 +1,9 @@
 import { Axios } from '@apis/Axios';
 import { GetTeamResponse } from 'src/types/team';
 
-export const getAlarm = async (teamId: number): Promise<GetTeamResponse> => {
+export const getAlarm = async (
+  teamId: number | null
+): Promise<GetTeamResponse> => {
   try {
     const response = await Axios.get(`/api/alarm/${teamId}`, {
       withCredentials: true,
@@ -12,6 +14,6 @@ export const getAlarm = async (teamId: number): Promise<GetTeamResponse> => {
     });
     return response.data;
   } catch (error) {
-    throw new Error(error.response?.data?.message || 'Something went wrong');
+    throw new Error(error.response?.data?.message);
   }
 };
diff --git a/src/components/alarm/alarm.tsx b/src/components/alarm/alarm.tsx
@@ -41,6 +41,7 @@ const AlarmLogo: React.FC<AlarmLogoProps> = ({ type }) => {
 const Alarm = ({ isAlarmOpen, toggleAlarm, setHover, data }: AlarmProps) => {
   const [shouldRender, setShouldRender] = useState(isAlarmOpen);
   const alarmMutation = useUpdateAlarmStatus();
+
   const { data: team } = useQuery({
     queryKey: ['team'],
     queryFn: getTeamById
@@ -75,10 +76,6 @@ const Alarm = ({ isAlarmOpen, toggleAlarm, setHover, data }: AlarmProps) => {
     alarmMutation.mutate(alarmId);
   };
 
-  useEffect(() => {
-    alarmMutation.mutate(10);
-  }, []);
-
   return (
     <>
       {shouldRender && (

diff --git a/src/components/calendar/AddEventModal.tsx b/src/components/calendar/AddEventModal.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import styled from 'styled-components';
 import * as Dialog from '@radix-ui/react-dialog';
@@ -13,8 +13,9 @@ import { useCalendarStore } from '@store/calendarStore';
 import { useIdStore } from '@store/idStore';
 
 const AddEventModal = ({ selectedDate, open, setOpen }: AddEventModalProps) => {
-  const { teamId } = useIdStore((state) => ({
-    teamId: state.teamId
+  const { teamId, setTeamId } = useIdStore((state) => ({
+    teamId: state.teamId,
+    setTeamId: state.setTeamId
   }));
   const location = useLocation();
   const { searchMonth, setEventList, setUpcomingEventList } = useCalendarStore(
@@ -98,6 +99,11 @@ const AddEventModal = ({ selectedDate, open, setOpen }: AddEventModalProps) => {
     });
   };
 
+  useEffect(() => {
+    const id = localStorage.getItem('teamId');
+    setTeamId(Number(id));
+  }, [teamId]);
+
   return (
     <>
       <DialogRoot open={open} onOpenChange={setOpen}>

diff --git a/src/components/sidebar/SideBar.tsx b/src/components/sidebar/SideBar.tsx
@@ -34,12 +34,7 @@ export const SideBar = () => {
   const navigate = useNavigate();
   const location = useLocation();
 
-  const { data, isError } = useGetAlarmList(
-    Number(localStorage.getItem('teamId')) || null
-  );
-  if (isError) {
-    return null;
-  }
+  const { result } = useGetAlarmList(Number(localStorage.getItem('teamId')));
 
   const handleNavigate = (path: string) => {
     navigate(path);
@@ -130,7 +125,7 @@ export const SideBar = () => {
         {isAlarmOpen ? <BellClick /> : <Bell />}
         {hover && <SideBarText selected={isAlarmOpen}>알림</SideBarText>}
         <Alarm
-          data={data?.result.alarmList}
+          data={result?.alarmList}
           isAlarmOpen={isAlarmOpen}
           toggleAlarm={toggleAlarm}
           setHover={setHover}

diff --git a/src/hooks/alarm/useGetAlarmList.ts b/src/hooks/alarm/useGetAlarmList.ts
@@ -3,7 +3,7 @@ import { getAlarm } from '@apis/alarm/getAlarmList';
 import { AlarmListType } from 'src/types/alarm';
 
 export const useGetAlarmList = (
-  teamId: number
+  teamId: number | null
 ): UseQueryResult<AlarmListType> => {
   return useQuery({
     queryKey: ['alarm', teamId],

diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx
@@ -3,6 +3,7 @@ import LogoFadeIn from '@components/login/LogoFadeIn';
 import { useLogoFadeIn } from '@hooks/useLogoFadeIn';
 import styled from 'styled-components';
 import { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
 
 const Wrapper = styled.div`
   height: 100vh;
@@ -11,6 +12,7 @@ const Wrapper = styled.div`
 `;
 
 export const LoginPage = () => {
+  const location = useLocation();
   const isLogoFadeInActivate = useLogoFadeIn(3000);
 
   useEffect(() => {
@@ -26,7 +28,7 @@ export const LoginPage = () => {
 
     localStorage.setItem('accessToken', accessToken);
     localStorage.setItem('isNewUser', isNewUser);
-  }, []);
+  }, [location]);
 
   return (
     <Wrapper>