Merge pull request #44 from team-Ollie/15-feature-Calendar-Detail-Modal

15 feature calendar detail modal
team-Ollie · Jul 2, 2024 · cd26e9f · cd26e9f
2 parents 7094196 + 69efea3
commit cd26e9f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/apis/hooks/calendar.ts b/apis/hooks/calendar.ts
@@ -10,11 +10,11 @@ const useGetMonthCalendar = () => {
 };
 
 const useGetProgramDetail = (programIdx: number) => {
-  const { data } = useQuery({
+  const { data, isLoading } = useQuery({
     queryKey: ["getProgramDetail"],
     queryFn: () => getProgramDetail(programIdx),
   });
-  return { data };
+  return { data, isLoading };
 };
 
 export { useGetMonthCalendar, useGetProgramDetail };
diff --git a/components/calendar/CalendarModal.tsx b/components/calendar/CalendarModal.tsx
@@ -9,8 +9,11 @@ const CalendarModal = ({
   programIdx: number;
   toggleModal: () => void;
 }) => {
-  const { data }: { data: GetProgramDetailBody } =
-    useGetProgramDetail(programIdx);
+  const { data, isLoading } = useGetProgramDetail(programIdx);
+
+  if (isLoading) {
+    return <div>Loading...</div>;
+  }
 
   return (
     data && (

diff --git a/pages/login.tsx b/pages/login.tsx
@@ -51,7 +51,6 @@ const Login: NextPage = () => {
     mutationKey: ["SignIn"],
     mutationFn: SignIn,
     onSuccess: async (data) => {
-      console.log(data);
       const accessToken = data.result.accessToken;
       const refreshToken = data.result.refreshToken;
       const isAdmin = data.result.isAdmin;