Feat/main #31 추가 후 main동작이 안 됨 수정

Author: Ju

src/api/ScheduleApi.jsx

@@ -2,22 +2,28 @@ import { instance } from "../shared/AxiosInstance";
 
 export const ScheduleApi = {
   getSccheduleApi: (payload) => {
-    console.log(payload);
     //const data = instance.get(`/v2-dto/users/${payload}/events`);
     const data = instance.get(`/users/${payload}/events`);
     return data;
   },
+
   getInfiniteScrollPage: (payload) => {
     console.log(payload.userId);
     const data = instance.get(
       `/v2-page/users/${payload.userId}/events?page=${payload.page}&size=${3}`
     );
     return data;
   },
+
   postScheduleApi: (payload) => {
     const data = instance.post("/events", payload);
     return data;
   },
+
+  getPastScheduleApi: () => {
+    const data = instance.get("/events/past");
+    return data;
+  },
   deleteScheduleApi: (payload) => {
     console.log(payload);
     const data = instance.delete(`/events/${payload}`);

src/components/Schedule/ScheduleAdd.jsx

@@ -86,7 +86,6 @@ const ScheduleAdd = () => {
         __postSchedule({
           Schedule: newSchedule,
           userId: window.localStorage.getItem("userId"),
-          dispatch,
         })
       );
       setSubject("");

src/components/layout/Layout.jsx

@@ -63,7 +63,6 @@ const Layout = ({ children }) => {
         setHeader(null);
         break;
     }
-    console.log(header);
   }, [pagePathName.pathname, id]);
 
   return (

src/components/main/Main.jsx

@@ -14,6 +14,7 @@ const Main = () => {
   const [email, setEmail] = useState("");
   const dispatch = useDispatch();
   const { schedules } = useSelector((state) => state.ScheduleSlice);
+  const { isLoding } = useSelector((state) => state.ScheduleSlice);
   console.log(schedules);
 
   useEffect(() => {
@@ -31,7 +32,7 @@ const Main = () => {
     } else {
       navigate(`/login`);
     }
-  }, [navigate, email, dispatch]);
+  }, [navigate, dispatch]);
 
   return (
     <>

src/redux/modules/ScheduleSlice.jsx

@@ -33,6 +33,7 @@ export const __getSchedule = createAsyncThunk(
     try {
       console.log("연결");
       const { data } = await ScheduleApi.getSccheduleApi(payload);
+      console.log(data.data);
       return thunkAPI.fulfillWithValue(data.data);
     } catch (error) {
       console.log(error);
@@ -46,6 +47,7 @@ export const __getScrollPage = createAsyncThunk(
     try {
       console.log("연결");
       const { data } = await ScheduleApi.getInfiniteScrollPage(payload);
+      console.log(data.data);
       return thunkAPI.fulfillWithValue(data);
     } catch (error) {
       console.log(error);
@@ -58,23 +60,30 @@ export const __postSchedule = createAsyncThunk(
   async (payload, thunkAPI) => {
     try {
       const data = await ScheduleApi.postScheduleApi(payload.Schedule);
-      thunkAPI.dispatch(__getSchedule(payload.userId));
-      return thunkAPI.fulfillWithValue(data.data);
+      console.log(payload.userId);
+      payload.dispatch(__getSchedule(payload.userId));
+      // return thunkAPI.fulfillWithValue(data.data);
     } catch (error) {
       return thunkAPI.rejectWithValue(error);
     }
   }
 );
 
 export const __getPastSchedlue = createAsyncThunk(
-  "schedule/getSchedules",
+  "schedule/getPastSchedlue",
   async (payload, thunkAPI) => {
     try {
       console.log("연결");
       const { data } = await ScheduleApi.getPastScheduleApi();
+      console.log(data);
       return thunkAPI.fulfillWithValue(data.data);
     } catch (error) {
-      console.log(error);
+      console.log(error.response.status);
+      const errorStatus = error.response.status;
+
+      if (errorStatus === 500) {
+        window.alert("서버에 문제가 생겼습니다.");
+      }
     }
   }
 );
@@ -92,6 +101,7 @@ export const ScheduleSlice = createSlice({
       state.isLoading = true;
     },
     [__getSchedule.fulfilled]: (state, action) => {
+      state.isLoading = false;
       console.log(action.payload);
       let schedules = action.payload;
       let tmp = 0;
@@ -101,13 +111,6 @@ export const ScheduleSlice = createSlice({
             tmp = schedules[i];
             schedules[i] = schedules[j];
             schedules[j] = tmp;
-            // if (schedules[i].dday === 0) {
-            //   if (schedules[i].dday > schedules[j].dday) {
-            //     tmp = schedules[i];
-            //     schedules[i] = schedules[j];
-            //     schedules[j] = tmp;
-            //   }
-            // }
           }
         }
       }
@@ -145,27 +148,31 @@ export const ScheduleSlice = createSlice({
       state.isLoading = false;
       state.error = action.payload;
     },
+
     [__getPastSchedlue.pending]: (state) => {
       state.isLoading = true;
     },
     [__getPastSchedlue.fulfilled]: (state, action) => {
+      console.log(action.payload);
       state.isLoading = false;
       state.pastSchedules = action.payload;
     },
+
     [__getPastSchedlue.rejected]: (state, action) => {
       state.isLoading = false;
       state.error = action.payload;
     },
-    [__deleteSchedule.pending]: (state) => {
-      state.isLoading = true;
-    },
-    [__deleteSchedule.fulfilled]: (state, action) => {
-      state.isLoading = false;
-    },
-    [__deleteSchedule.rejected]: (state, action) => {
-      state.isLoading = false;
-      state.error = action.error.message;
-    },
+
+    // [__deleteSchedule.pending]: (state) => {
+    //   state.isLoading = true;
+    // },
+    // [__deleteSchedule.fulfilled]: (state, action) => {
+    //   state.isLoading = false;
+    // },
+    // [__deleteSchedule.rejected]: (state, action) => {
+    //   state.isLoading = false;
+    //   state.error = action.error.message;
+    // },
   },
 });
 

src/shared/Router.jsx

@@ -28,8 +28,8 @@ const Router = () => {
       <Layout>
         <Routes>
           {/* 메인과 디테일 페이지 */}
-          {/* <Route path="/main" element={<MainPage />} /> */}
-          <Route path="/main" element={<InfiniteScroll />} />
+          <Route path="/main" element={<MainPage />} />
+          {/* <Route path="/main" element={<InfiniteScroll />} /> */}
           {localStorage.getItem("nickname") ? (
             <Route path="/" element={<MainPage />} />
           ) : (