From 3ad9b9c594d7e7a48fcecd474f93d6529993c8ab Mon Sep 17 00:00:00 2001
From: greatSweetMango <93255519+greatSweetMango@users.noreply.github.com>
Date: Sat, 23 Mar 2024 22:59:31 +0900
Subject: [PATCH 01/28] Update main-deploy.yml

---
 .github/workflows/main-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml
index 95b230432..1711b37e0 100644
--- a/.github/workflows/main-deploy.yml
+++ b/.github/workflows/main-deploy.yml
@@ -1,6 +1,7 @@
 name: Deploy to 42ggClientS3
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - deploy

From 26dc5fa989122b1d44328ef5e9b539dccae2e766 Mon Sep 17 00:00:00 2001
From: greatSweetMango <93255519+greatSweetMango@users.noreply.github.com>
Date: Sat, 23 Mar 2024 22:59:31 +0900
Subject: [PATCH 02/28] Update main-deploy.yml

---
 .github/workflows/main-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml
index 95b230432..1711b37e0 100644
--- a/.github/workflows/main-deploy.yml
+++ b/.github/workflows/main-deploy.yml
@@ -1,6 +1,7 @@
 name: Deploy to 42ggClientS3
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - deploy

From a41b1239214e054ac9222e5c76a2d4aa0b441187 Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Mon, 8 Apr 2024 17:38:14 +0900
Subject: [PATCH 03/28] =?UTF-8?q?[Fix]=20=ED=85=9C=ED=94=8C=EB=A6=BF?=
 =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=ED=83=80=EC=9E=85=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/recruitments/recruitmentsuser/tmplateEditor.tsx | 8 ++++----
 .../modal/admin/AdminRecruitMessageTemplateModal.tsx      | 6 +++---
 types/recruit/recruitments.d.ts                           | 6 ++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
index e7034409e..2fb2ff1eb 100644
--- a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
+++ b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
@@ -6,11 +6,11 @@ import { modalState } from 'utils/recoil/modal';
 import { toastState } from 'utils/recoil/toast';
 import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
 
-function TemplateEditor({ messageType, message }: IRecruitMessageTemplate) {
+function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
   const resetModal = useResetRecoilState(modalState);
   const [tempalte, setTemplate] = useState<IRecruitMessageTemplate>({
     messageType: messageType,
-    message: message,
+    content: content,
   });
   const [alert, setAlert] = useState<string>('');
   const setSnackbar = useSetRecoilState(toastState);
@@ -29,7 +29,7 @@ function TemplateEditor({ messageType, message }: IRecruitMessageTemplate) {
       setAlert(`${DATE}를 포함해주세요.`);
     } else {
       setAlert('');
-      setTemplate({ ...tempalte, message: message });
+      setTemplate({ ...tempalte, content: message });
     }
   };
 
@@ -68,7 +68,7 @@ function TemplateEditor({ messageType, message }: IRecruitMessageTemplate) {
       <div className={styles.textarea}>
         <textarea
           name='template'
-          defaultValue={message}
+          defaultValue={content}
           placeholder='템플릿을 입력해주세요.'
           rows={10}
           onChange={inputHandler}
diff --git a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx b/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
index 188c9bc3c..6c570fcc3 100644
--- a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
+++ b/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
@@ -48,9 +48,9 @@ function AdminRecruitMessageTemplateModal() {
 
   return (
     <div className={styles.container}>
-      <TemplateEditor messageType='INTERVIEW' message={templates.INTERVIEW} />
-      <TemplateEditor messageType='PASS' message={templates.PASS} />
-      <TemplateEditor messageType='FAIL' message={templates.FAIL} />
+      <TemplateEditor messageType='INTERVIEW' content={templates.INTERVIEW} />
+      <TemplateEditor messageType='PASS' content={templates.PASS} />
+      <TemplateEditor messageType='FAIL' content={templates.FAIL} />
     </div>
   );
 }
diff --git a/types/recruit/recruitments.d.ts b/types/recruit/recruitments.d.ts
index d21116f94..c2d96f874 100644
--- a/types/recruit/recruitments.d.ts
+++ b/types/recruit/recruitments.d.ts
@@ -89,11 +89,13 @@ export type RecruitmentMessageType = 'INTERVIEW' | 'PASS' | 'FAIL';
 
 export interface IRecruitMessageTemplate {
   messageType: RecruitmentMessageType;
-  message: string;
+  content: string;
 }
-export interface IRecruitmentTemplate extends IRecruitMessageTemplate {
+export interface IRecruitmentTemplate {
   messageId: number;
+  messageType: RecruitmentMessageType;
   isUse: boolean;
+  message: string;
 }
 
 export interface IRecruitmentTemplateList {

From 06b64a127ac4460b209093b0d30ef87700217324 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Mon, 8 Apr 2024 18:43:51 +0900
Subject: [PATCH 04/28] [Fix] recruitmentDtoList -> recruitments #1256

---
 .../recruitments/RecruitmentsHistoryList.tsx  |   8 +-
 .../recruitmentsDetail/RecruitmentDetail.tsx  |   2 +-
 .../components/ActionSelectorButtons.tsx      | 132 ++++++++----------
 hooks/admin/recruit/useInfiniteRecruitList.ts |  41 ++++++
 types/admin/adminRecruitmentsTypes.ts         |   7 +-
 5 files changed, 113 insertions(+), 77 deletions(-)
 create mode 100644 hooks/admin/recruit/useInfiniteRecruitList.ts

diff --git a/components/admin/recruitments/RecruitmentsHistoryList.tsx b/components/admin/recruitments/RecruitmentsHistoryList.tsx
index 181ce9dac..5aedb36b0 100644
--- a/components/admin/recruitments/RecruitmentsHistoryList.tsx
+++ b/components/admin/recruitments/RecruitmentsHistoryList.tsx
@@ -48,7 +48,7 @@ function RecruitmentsHistoryList({
   setPage: Dispatch<SetStateAction<RecruitmentsPages>>;
 }) {
   const [recruitData, setRecruitData] = useState<IrecruitTable>({
-    recruitmentDtoList: [],
+    recruitments: [],
     totalPage: 0,
     currentPage: 0,
   });
@@ -64,7 +64,7 @@ function RecruitmentsHistoryList({
       );
       // FIXME : 페이지네이션 x 임시로 1페이지로 고정
       setRecruitData({
-        recruitmentDtoList: res.data.recruitmentDtoList,
+        recruitments: res.data.recruitments,
         totalPage: 1,
         currentPage: 1,
       });
@@ -156,8 +156,8 @@ function RecruitmentsHistoryList({
         <Table className={styles.table} aria-label='customized table'>
           <AdminTableHead tableName={'recruitment'} table={tableTitle} />
           <TableBody className={styles.tableBody}>
-            {recruitData.recruitmentDtoList.length > 0 ? (
-              recruitData.recruitmentDtoList.map((recruit: Irecruit) => (
+            {recruitData.recruitments.length > 0 ? (
+              recruitData.recruitments.map((recruit: Irecruit) => (
                 <TableRow className={styles.tableRow} key={recruit.id}>
                   {tableFormat['recruitment'].columns.map(
                     (columnName: string, index: number) => (
diff --git a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
index be5031632..28b26c442 100644
--- a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
@@ -33,7 +33,7 @@ export default function RecruitmentDetail({
   const getRecruitmentInfo = async () => {
     setIsLoading(true);
     try {
-      const res = await instance.get('/recruitments/' + recruit.id);
+      const res = await instance.get(`/recruitments/${recruit.id}`);
       const data: Irecruit = {
         id: recruit.id,
         status: recruit.status,
diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index 5ab18218c..d760f9e81 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -10,20 +10,11 @@ import {
 } from '@mui/material';
 import { Irecruit } from 'types/admin/adminRecruitmentsTypes';
 import { instance, instanceInManage } from 'utils/axios';
+import { dateToDateTimeLocalString } from 'utils/handleTime';
 import { toastState } from 'utils/recoil/toast';
+import useInfiniteRecruitList from 'hooks/admin/recruit/useInfiniteRecruitList';
 import styles from 'styles/admin/recruitments/recruitmentEdit/components/ActionSelectorButtons.module.scss';
 
-// interface PagenatedResponse {
-//   recruitmentHistory: Irecruit[];
-//   totalPage: number;
-// }
-
-// function fetchRecruitMemtHistoryData(page: number) {
-//   return instance.get(`/recruitments?page=${page}&size=${8}`).then((res) => {
-//     return res.data;
-//   });
-// }
-
 interface ActionSelectorButtonsProps {
   recruitmentEditInfo: Irecruit;
   importRecruitmentInfo: (recruitId: number) => void;
@@ -39,75 +30,67 @@ export default function ActionSelectorButtons({
     []
   );
 
-  const getRecruitHandler = async () => {
-    try {
-      // FIXME : 1페이지 고정인 부분 주석으로 설명 추가해주세요. (의도된것인지 / 최근 100개만 보는 것인지 등)
-      const res = await instance.get(
-        `/admin/recruitments?page=${1}&size=${100}`
-      );
-      setRecruitmentsHistory(res.data.recruitmentDtoList);
-    } catch (e: any) {
-      setSnackBar({
-        toastName: 'get recruitment',
-        severity: 'error',
-        message: `이전 공고를 불러오는데 실패했습니다.`,
-        clicked: true,
-      });
-    }
-  };
-
-  // const { data, error, isLoading, hasNextPage, fetchNextPage } =
-  //   InfiniteScroll<PagenatedResponse>(
-  //     'recruitment',
-  //     fetchRecruitMemtHistoryData,
-  //     'RT04'
-  //   );
+  // const getRecruitHandler = async () => {
+  //   try {
+  //     // FIXME : 1페이지 고정인 부분 주석으로 설명 추가해주세요. (의도된것인지 / 최근 100개만 보는 것인지 등)
+  //     const res = await instance.get(
+  //       `/admin/recruitments?page=${1}&size=${100}`
+  //     );
+  //     setRecruitmentsHistory(res.data.recruitmentDtoList);
+  //   } catch (e: any) {
+  //     setSnackBar({
+  //       toastName: 'get recruitment',
+  //       severity: 'error',
+  //       message: `이전 공고를 불러오는데 실패했습니다.`,
+  //       clicked: true,
+  //     });
+  //   }
+  // };
 
   const [selectedId, setSelectedId] = useState<string>('');
 
+  const { data, isLoading, isError, targetRef } = useInfiniteRecruitList();
+
   const setSnackBar = useSetRecoilState(toastState);
 
   const createRecruitmentHandler = async () => {
     try {
-      const convertedForm = recruitmentEditInfo.form?.map((question) => {
-        if (question.inputType === 'TEXT') {
-          return {
-            question: question.question,
-            inputType: question.inputType,
-          };
-        } else {
-          const stringCheckList = question.checkList?.map(
-            (item) => item.content
-          );
-          return {
-            question: question.question,
-            inputType: question.inputType,
-            checkList: stringCheckList,
-          };
-        }
-      });
-
       const res = await instance.post(`/admin/recruitments`, {
         title: recruitmentEditInfo.title,
-        startDateTime: '2024-04-06T08:29:07.424Z', //recruitmentEditInfo.startDate.toISOString(),
-        endDateTime: '2024-04-08T08:29:07.424Z', //recruitmentEditInfo.endDate.toISOString(),
+        startDate: dateToDateTimeLocalString(recruitmentEditInfo.startDate),
+        endDate: dateToDateTimeLocalString(recruitmentEditInfo.endDate),
         generation: recruitmentEditInfo.generation,
         contents: recruitmentEditInfo.contents,
-        form: convertedForm,
+        form: recruitmentEditInfo.form,
       });
-      // const res = await mockInstance.post(`admin/recruitments`, {
-      //   title: recruitmentEditInfo.title,
-      //   startDate: recruitmentEditInfo.startDate,
-      //   endDate: recruitmentEditInfo.endDate,
-      //   generation: recruitmentEditInfo.generation,
-      //   contents: recruitmentEditInfo.contents,
-      //   form: recruitmentEditInfo.form,
-      // });
     } catch (e: any) {
       setSnackBar({
         toastName: 'post recruitment',
         severity: 'error',
-        message: `생성 요청에 실패하였습니다.`,
+        message: e.response.data.message,
+        clicked: true,
+      });
+    }
+  };
+
+  const modifyRecruitmentHandler = async () => {
+    try {
+      const res = await instance.put(
+        `/admin/recruitments/${recruitmentEditInfo.id}`,
+        {
+          title: recruitmentEditInfo.title,
+          startDate: dateToDateTimeLocalString(recruitmentEditInfo.startDate),
+          endDate: dateToDateTimeLocalString(recruitmentEditInfo.endDate),
+          generation: recruitmentEditInfo.generation,
+          contents: recruitmentEditInfo.contents,
+          form: recruitmentEditInfo.form,
+        }
+      );
+    } catch (e: any) {
+      setSnackBar({
+        toastName: 'put recruitment',
+        severity: 'error',
+        message: e.response.data.message,
         clicked: true,
       });
     }
@@ -117,10 +100,6 @@ export default function ActionSelectorButtons({
     setSelectedId(target.value);
   };
 
-  useEffect(() => {
-    getRecruitHandler();
-  }, []);
-
   return (
     <div className={styles.mainContainer}>
       <div className={styles.importWrapper}>
@@ -133,7 +112,16 @@ export default function ActionSelectorButtons({
             style={{ backgroundColor: 'white' }}
             onChange={selectChangehandler}
           >
-            {recruitmentsHistory.length === 0 ? (
+            {data?.pages.map((page, pageIndex) => {
+              return page.recruitments?.map((recruit) => {
+                return (
+                  <MenuItem key={recruit.id} value={recruit.id}>
+                    {recruit.title}
+                  </MenuItem>
+                );
+              });
+            })}
+            {/* {recruitmentsHistory.length === 0 ? (
               <MenuItem key={-1} value={-1}>
                 기존 공고가 없습니다.
               </MenuItem>
@@ -143,7 +131,7 @@ export default function ActionSelectorButtons({
                   {recruit.title}
                 </MenuItem>
               ))
-            )}
+            )} */}
           </Select>
         </FormControl>
         <Button
@@ -163,7 +151,9 @@ export default function ActionSelectorButtons({
         </Button>
       )}
       {actionType === 'MODIFY' && (
-        <Button variant='contained'>공고 수정</Button>
+        <Button variant='contained' onClick={modifyRecruitmentHandler}>
+          공고 수정
+        </Button>
       )}
     </div>
   );
diff --git a/hooks/admin/recruit/useInfiniteRecruitList.ts b/hooks/admin/recruit/useInfiniteRecruitList.ts
new file mode 100644
index 000000000..21cb29c80
--- /dev/null
+++ b/hooks/admin/recruit/useInfiniteRecruitList.ts
@@ -0,0 +1,41 @@
+import { useEffect, useRef } from 'react';
+import { recruitListData } from 'types/admin/adminRecruitmentsTypes';
+import { instance } from 'utils/axios';
+import { InfiniteScroll } from 'utils/infinityScroll';
+
+const fetchRecruitList = (page: number) => {
+  return instance
+    .get(`/admin/recruitments?page=${page}&size=${8}`)
+    .then((res) => {
+      return res.data;
+    });
+};
+
+const useInfiniteRecruitList = () => {
+  const { data, isLoading, isError, fetchNextPage, hasNextPage } =
+    InfiniteScroll<recruitListData>(['recruitList'], fetchRecruitList, 'JY09');
+
+  // 감지할 대상
+  const targetRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const observer = new IntersectionObserver((entries) => {
+      if (entries[0].isIntersecting && hasNextPage) {
+        fetchNextPage();
+      }
+    });
+    const currentTarget = targetRef.current;
+    if (currentTarget && hasNextPage) {
+      observer.observe(currentTarget);
+      return;
+    }
+    if (currentTarget && !hasNextPage) {
+      observer.unobserve(currentTarget);
+    }
+    console.log(data);
+  }, [fetchNextPage, hasNextPage]);
+
+  return { data, isLoading, isError, targetRef };
+};
+
+export default useInfiniteRecruitList;
diff --git a/types/admin/adminRecruitmentsTypes.ts b/types/admin/adminRecruitmentsTypes.ts
index 02aa42969..2ba4ff056 100644
--- a/types/admin/adminRecruitmentsTypes.ts
+++ b/types/admin/adminRecruitmentsTypes.ts
@@ -33,7 +33,7 @@ export interface Inotication {
 }
 
 export interface IrecruitTable {
-  recruitmentDtoList: Array<Irecruit>;
+  recruitments: Array<Irecruit>;
   totalPage: number;
   currentPage: number;
 }
@@ -66,6 +66,11 @@ export interface IrecruitArrayTable {
   currentPage: number;
 }
 
+export interface recruitListData {
+  recruitments: Irecruit[];
+  totalPage: number;
+}
+
 export interface RecruitmentsPages {
   pageType: 'MAIN' | 'EDIT' | 'DETAIL';
   props:

From 67bbf0f5463579d8218229357c4141ff57df61c4 Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Mon, 8 Apr 2024 18:54:58 +0900
Subject: [PATCH 05/28] =?UTF-8?q?[Fix]=20=EC=82=AC=EC=9A=A9=20=EC=A4=91?=
 =?UTF-8?q?=EC=9D=B8=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=ED=95=84=ED=84=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminRecruitMessageTemplateModal.tsx      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx b/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
index 6c570fcc3..ab8320db1 100644
--- a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
+++ b/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
@@ -20,17 +20,19 @@ function AdminRecruitMessageTemplateModal() {
   const getTemplates = async () => {
     try {
       const res = await instanceInManage.get('/recruitments/result/message');
-      const messages = res.data.messages.reduce(
-        (acc: TemplateListType, curr: IRecruitmentTemplate) => {
-          acc[curr.messageType] = curr.message;
-          return acc;
-        },
-        {
-          INTERVIEW: '',
-          PASS: '',
-          FAIL: '',
-        }
-      );
+      const messages = res.data.messages
+        .filter((message: IRecruitmentTemplate) => message.isUse)
+        .reduce(
+          (acc: TemplateListType, curr: IRecruitmentTemplate) => {
+            acc[curr.messageType] = curr.message;
+            return acc;
+          },
+          {
+            INTERVIEW: '',
+            PASS: '',
+            FAIL: '',
+          }
+        );
       setTemplates(messages);
     } catch (e: any) {
       setSnackbar({

From 8d6d5ba9555385887322ed551fba518811d2b8b1 Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Mon, 8 Apr 2024 19:06:35 +0900
Subject: [PATCH 06/28] =?UTF-8?q?[Fix]=20RecruitmentHistoryList=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/admin/recruitments/RecruitmentsHistoryList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/admin/recruitments/RecruitmentsHistoryList.tsx b/components/admin/recruitments/RecruitmentsHistoryList.tsx
index 181ce9dac..9e51bab2b 100644
--- a/components/admin/recruitments/RecruitmentsHistoryList.tsx
+++ b/components/admin/recruitments/RecruitmentsHistoryList.tsx
@@ -64,7 +64,7 @@ function RecruitmentsHistoryList({
       );
       // FIXME : 페이지네이션 x 임시로 1페이지로 고정
       setRecruitData({
-        recruitmentDtoList: res.data.recruitmentDtoList,
+        recruitmentDtoList: res.data.recruitments,
         totalPage: 1,
         currentPage: 1,
       });

From c3c1793198d548b0b1f70b4c92fd4dbcb1d21f8d Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Mon, 8 Apr 2024 19:12:16 +0900
Subject: [PATCH 07/28] =?UTF-8?q?[Fix]=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=ED=9B=84=20=EB=AA=A8=EB=8B=AC=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/recruitments/recruitmentsuser/tmplateEditor.tsx    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
index 2fb2ff1eb..394ed6aba 100644
--- a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
+++ b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
@@ -1,13 +1,11 @@
 import { useState } from 'react';
-import { useResetRecoilState, useSetRecoilState } from 'recoil';
+import { useSetRecoilState } from 'recoil';
 import { IRecruitMessageTemplate } from 'types/recruit/recruitments';
 import { instanceInManage } from 'utils/axios';
-import { modalState } from 'utils/recoil/modal';
 import { toastState } from 'utils/recoil/toast';
 import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
 
 function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
-  const resetModal = useResetRecoilState(modalState);
   const [tempalte, setTemplate] = useState<IRecruitMessageTemplate>({
     messageType: messageType,
     content: content,
@@ -51,7 +49,6 @@ function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
         message: `템플릿이 성공적으로 등록되었습니다.`,
         clicked: true,
       });
-      resetModal();
     } catch (e: any) {
       setSnackbar({
         toastName: `bad request`,

From 3e4422e54f7f2748d1f80cf7a1f547499237123a Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Mon, 8 Apr 2024 19:17:12 +0900
Subject: [PATCH 08/28] =?UTF-8?q?[Chore]=20=EC=98=A4=ED=83=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/recruitments/recruitmentsuser/tmplateEditor.tsx   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
index 394ed6aba..233f9cc99 100644
--- a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
+++ b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
@@ -6,7 +6,7 @@ import { toastState } from 'utils/recoil/toast';
 import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
 
 function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
-  const [tempalte, setTemplate] = useState<IRecruitMessageTemplate>({
+  const [template, setTemplate] = useState<IRecruitMessageTemplate>({
     messageType: messageType,
     content: content,
   });
@@ -27,7 +27,7 @@ function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
       setAlert(`${DATE}를 포함해주세요.`);
     } else {
       setAlert('');
-      setTemplate({ ...tempalte, content: message });
+      setTemplate({ ...template, content: message });
     }
   };
 
@@ -42,7 +42,7 @@ function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
       return;
     }
     try {
-      await instanceInManage.post('/recruitments/result/message', tempalte);
+      await instanceInManage.post('/recruitments/result/message', template);
       setSnackbar({
         toastName: `post request`,
         severity: 'success',

From ae732e8fad609bcee22c50a54c72dff4b7fe2092 Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Mon, 8 Apr 2024 19:24:39 +0900
Subject: [PATCH 09/28] =?UTF-8?q?[Chore]=20DetailRecruitUserList=20?=
 =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailRecruitUserList.tsx                 | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx b/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
index bbfbe122d..4e4c5a095 100644
--- a/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
+++ b/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
@@ -26,28 +26,28 @@ const tableTitle: { [key: string]: string } = {
 };
 
 function DetailRecruitUserList({ recruitId }: { recruitId: number }) {
-  // const [currentPage, setCurrentPage] = useState<number>(1);
-  const { recruitUserData, questions } = useRecruitmentUserFilter(
-    recruitId
-    // currentPage
-  );
+  // // const [currentPage, setCurrentPage] = useState<number>(1);
+  // const { recruitUserData, questions } = useRecruitmentUserFilter(
+  //   recruitId
+  //   // currentPage
+  // );
 
-  if (!recruitUserData.applicationResults?.length) {
-    return (
-      <TableContainer className={styles.tableContainer} component={Paper}>
-        <Table className={styles.table} aria-label='customized table'>
-          <AdminTableHead tableName={'recruitUserList'} table={tableTitle} />
-          <TableBody className={styles.tableBody}>
-            <AdminEmptyItem content={'공고 지원자 내역이 비어있습니다'} />
-          </TableBody>
-        </Table>
-      </TableContainer>
-    );
-  }
+  // if (!recruitUserData.applicationResults?.length) {
+  //   return (
+  //     <TableContainer className={styles.tableContainer} component={Paper}>
+  //       <Table className={styles.table} aria-label='customized table'>
+  //         <AdminTableHead tableName={'recruitUserList'} table={tableTitle} />
+  //         <TableBody className={styles.tableBody}>
+  //           <AdminEmptyItem content={'공고 지원자 내역이 비어있습니다'} />
+  //         </TableBody>
+  //       </Table>
+  //     </TableContainer>
+  //   );
+  // }
 
   return (
     <>
-      {FilterQptionsUI(recruitUserData.applicationResults, recruitId)}
+      {/* {FilterQptionsUI(recruitUserData.applicationResults, recruitId)}
       <TableContainer className={styles.tableContainer} component={Paper}>
         <Table className={styles.table} aria-label='customized table'>
           <TableHead className={styles.tableHeader}>
@@ -68,7 +68,7 @@ function DetailRecruitUserList({ recruitId }: { recruitId: number }) {
             )}
           </TableBody>
         </Table>
-      </TableContainer>
+      </TableContainer> */}
       <div className={styles.pageNationContainer}>
         {/* <PageNation
           curPage={recruitUserData.currentPage}

From 4054da8a4bc06138ca7b8a7807e0da7db167ace7 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Mon, 8 Apr 2024 19:56:36 +0900
Subject: [PATCH 10/28] =?UTF-8?q?[Feat]=20=EA=B3=B5=EA=B3=A0=20=EB=B6=88?=
 =?UTF-8?q?=EB=9F=AC=EC=98=A4=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EB=84=A4=EC=9D=B4=EC=85=98=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruitmentsDetail/RecruitmentDetail.tsx  |  2 +-
 .../components/ActionSelectorButtons.tsx      | 61 +++++++++++--------
 hooks/admin/recruit/useInfiniteRecruitList.ts | 41 -------------
 pages/admin/recruitments.tsx                  |  1 -
 4 files changed, 36 insertions(+), 69 deletions(-)
 delete mode 100644 hooks/admin/recruit/useInfiniteRecruitList.ts

diff --git a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
index 28b26c442..bfba5d331 100644
--- a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
@@ -33,7 +33,7 @@ export default function RecruitmentDetail({
   const getRecruitmentInfo = async () => {
     setIsLoading(true);
     try {
-      const res = await instance.get(`/recruitments/${recruit.id}`);
+      const res = await instance.get(`admin/recruitments/${recruit.id}`);
       const data: Irecruit = {
         id: recruit.id,
         status: recruit.status,
diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index d760f9e81..d9a1c12f4 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -1,5 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useSetRecoilState } from 'recoil';
+import { More } from '@mui/icons-material';
+import MoreHorizIcon from '@mui/icons-material/MoreHoriz';
 import {
   Button,
   FormControl,
@@ -8,13 +10,24 @@ import {
   Select,
   SelectChangeEvent,
 } from '@mui/material';
-import { Irecruit } from 'types/admin/adminRecruitmentsTypes';
-import { instance, instanceInManage } from 'utils/axios';
+import { Irecruit, recruitListData } from 'types/admin/adminRecruitmentsTypes';
+import { instance } from 'utils/axios';
 import { dateToDateTimeLocalString } from 'utils/handleTime';
+import { InfiniteScroll } from 'utils/infinityScroll';
 import { toastState } from 'utils/recoil/toast';
-import useInfiniteRecruitList from 'hooks/admin/recruit/useInfiniteRecruitList';
 import styles from 'styles/admin/recruitments/recruitmentEdit/components/ActionSelectorButtons.module.scss';
 
+const ITEM_HEIGHT = 48;
+const ITEM_PADDING_TOP = 8;
+const MenuProps = {
+  PaperProps: {
+    style: {
+      maxHeight: ITEM_HEIGHT * 4.5 + ITEM_PADDING_TOP,
+      width: 250,
+    },
+  },
+};
+
 interface ActionSelectorButtonsProps {
   recruitmentEditInfo: Irecruit;
   importRecruitmentInfo: (recruitId: number) => void;
@@ -26,30 +39,18 @@ export default function ActionSelectorButtons({
   importRecruitmentInfo,
   actionType,
 }: ActionSelectorButtonsProps) {
-  const [recruitmentsHistory, setRecruitmentsHistory] = useState<Irecruit[]>(
-    []
-  );
-
-  // const getRecruitHandler = async () => {
-  //   try {
-  //     // FIXME : 1페이지 고정인 부분 주석으로 설명 추가해주세요. (의도된것인지 / 최근 100개만 보는 것인지 등)
-  //     const res = await instance.get(
-  //       `/admin/recruitments?page=${1}&size=${100}`
-  //     );
-  //     setRecruitmentsHistory(res.data.recruitmentDtoList);
-  //   } catch (e: any) {
-  //     setSnackBar({
-  //       toastName: 'get recruitment',
-  //       severity: 'error',
-  //       message: `이전 공고를 불러오는데 실패했습니다.`,
-  //       clicked: true,
-  //     });
-  //   }
-  // };
-
   const [selectedId, setSelectedId] = useState<string>('');
 
-  const { data, isLoading, isError, targetRef } = useInfiniteRecruitList();
+  const fetchRecruitList = (page: number) => {
+    return instance
+      .get(`/admin/recruitments?page=${page}&size=${5}`)
+      .then((res) => {
+        return res.data;
+      });
+  };
+
+  const { data, isLoading, isError, fetchNextPage, hasNextPage } =
+    InfiniteScroll<recruitListData>(['recruitList'], fetchRecruitList, 'JY09');
 
   const setSnackBar = useSetRecoilState(toastState);
 
@@ -109,7 +110,10 @@ export default function ActionSelectorButtons({
             defaultValue={''}
             value={selectedId}
             label='기존 공고'
-            style={{ backgroundColor: 'white' }}
+            style={{
+              backgroundColor: 'white',
+            }}
+            MenuProps={MenuProps}
             onChange={selectChangehandler}
           >
             {data?.pages.map((page, pageIndex) => {
@@ -121,6 +125,11 @@ export default function ActionSelectorButtons({
                 );
               });
             })}
+            {hasNextPage && (
+              <Button onClick={() => fetchNextPage()}>
+                <MoreHorizIcon />
+              </Button>
+            )}
             {/* {recruitmentsHistory.length === 0 ? (
               <MenuItem key={-1} value={-1}>
                 기존 공고가 없습니다.
diff --git a/hooks/admin/recruit/useInfiniteRecruitList.ts b/hooks/admin/recruit/useInfiniteRecruitList.ts
deleted file mode 100644
index 21cb29c80..000000000
--- a/hooks/admin/recruit/useInfiniteRecruitList.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useEffect, useRef } from 'react';
-import { recruitListData } from 'types/admin/adminRecruitmentsTypes';
-import { instance } from 'utils/axios';
-import { InfiniteScroll } from 'utils/infinityScroll';
-
-const fetchRecruitList = (page: number) => {
-  return instance
-    .get(`/admin/recruitments?page=${page}&size=${8}`)
-    .then((res) => {
-      return res.data;
-    });
-};
-
-const useInfiniteRecruitList = () => {
-  const { data, isLoading, isError, fetchNextPage, hasNextPage } =
-    InfiniteScroll<recruitListData>(['recruitList'], fetchRecruitList, 'JY09');
-
-  // 감지할 대상
-  const targetRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const observer = new IntersectionObserver((entries) => {
-      if (entries[0].isIntersecting && hasNextPage) {
-        fetchNextPage();
-      }
-    });
-    const currentTarget = targetRef.current;
-    if (currentTarget && hasNextPage) {
-      observer.observe(currentTarget);
-      return;
-    }
-    if (currentTarget && !hasNextPage) {
-      observer.unobserve(currentTarget);
-    }
-    console.log(data);
-  }, [fetchNextPage, hasNextPage]);
-
-  return { data, isLoading, isError, targetRef };
-};
-
-export default useInfiniteRecruitList;
diff --git a/pages/admin/recruitments.tsx b/pages/admin/recruitments.tsx
index bae5bed59..57fd7b5ae 100644
--- a/pages/admin/recruitments.tsx
+++ b/pages/admin/recruitments.tsx
@@ -20,7 +20,6 @@ export default function Recruitments() {
       return <RecruitmentsMain setPage={setPage} />;
     case 'EDIT': {
       const props = page.props as RecruitmentEditProps;
-      console.log(props);
       return (
         <RecruitmentEdit
           setPage={setPage}

From 621683c0c5837876da736db5d6f0cfb38b357b4e Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Mon, 8 Apr 2024 21:05:31 +0900
Subject: [PATCH 11/28] =?UTF-8?q?[Fix]=20=EC=A7=80=EC=9B=90=EA=B3=B5?=
 =?UTF-8?q?=EA=B3=A0=20=EC=83=81=ED=83=9C=20=EC=88=98=EC=A0=95=20API=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/recruitments/RecruitmentsMain.tsx   |  6 +-
 .../components/ActionSelectorButtons.tsx      | 71 ++++++++++++-------
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/components/admin/recruitments/RecruitmentsMain.tsx b/components/admin/recruitments/RecruitmentsMain.tsx
index f2a0ad851..edf5076c4 100644
--- a/components/admin/recruitments/RecruitmentsMain.tsx
+++ b/components/admin/recruitments/RecruitmentsMain.tsx
@@ -1,10 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
-import {
-  RecruitmentsMainProps,
-  RecruitmentsPages,
-} from 'types/admin/adminRecruitmentsTypes';
+import { RecruitmentsMainProps } from 'types/admin/adminRecruitmentsTypes';
 import styles from 'styles/admin/store/StoreMain.module.scss';
-import RecruitmentEdit from './recruitmentsEdit/RecruitmentEdit';
 import RecruitmentsHistoryList from './RecruitmentsHistoryList';
 
 function RecruitmentsMain({ setPage }: RecruitmentsMainProps) {
diff --git a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
index e9aca0701..03c4738ce 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
@@ -1,27 +1,12 @@
-import {
-  ChangeEvent,
-  Dispatch,
-  SetStateAction,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react';
+import { ChangeEvent, Dispatch, SetStateAction, useState } from 'react';
 import { useSetRecoilState } from 'recoil';
-import {
-  Button,
-  FormControl,
-  FormControlLabel,
-  InputLabel,
-  MenuItem,
-  Select,
-  SelectChangeEvent,
-  Switch,
-} from '@mui/material';
+import { Button, FormControlLabel, Switch } from '@mui/material';
 import {
   Irecruit,
   RecruitmentEditProps,
   RecruitmentsPages,
 } from 'types/admin/adminRecruitmentsTypes';
+import { instance } from 'utils/axios';
 import { toastState } from 'utils/recoil/toast';
 import styles from 'styles/admin/recruitments/recruitmentDetail/components/ActionSelectorButtons.module.scss';
 
@@ -38,9 +23,10 @@ export default function ActionSelectorButtons({
 }: ActionSelectorButtonsProps) {
   const STATE = recruitmentInfo.status === '모집중' ? false : true;
 
-  const [isEnded, setIsEnded] = useState<boolean>(STATE);
+  const [isFinish, setIsFinish] = useState<boolean>(STATE);
 
   const isStarted = recruitmentInfo.startDate > new Date();
+  const setSnackBar = useSetRecoilState(toastState);
 
   const goToEditPage = (mode: string) => {
     setPage({
@@ -53,19 +39,54 @@ export default function ActionSelectorButtons({
     });
   };
 
-  const switchChangeHandler = (
+  const deleteRecruitHandler = async () => {
+    try {
+      const res = await instance.delete(
+        `/admin/recruitments/${recruitmentInfo.id}`
+      );
+      console.log(res);
+    } catch (e: any) {
+      setSnackBar({
+        toastName: 'post recruitment',
+        severity: 'error',
+        message: e.response.data.message,
+        clicked: true,
+      });
+    }
+  };
+
+  const switchChangeHandler = async (
     e: ChangeEvent<HTMLInputElement>,
     checked: boolean
   ) => {
-    // 공고 상태 수정 API 호출
-    setIsEnded(checked);
+    try {
+      const res = await instance.patch(
+        `/admin/recruitments/${recruitmentInfo.id}/statu`,
+        {
+          finish: !checked,
+        }
+      );
+      setIsFinish(!checked);
+      console.log(res);
+    } catch (e: any) {
+      setSnackBar({
+        toastName: 'patch recruitment',
+        severity: 'error',
+        message: 'API 요청에 실패하였습니다.',
+        clicked: true,
+      });
+    }
   };
 
   return (
     <>
       {isStarted ? (
         <div className={styles.mainContainer}>
-          <Button variant='contained' className={styles.button}>
+          <Button
+            variant='contained'
+            className={styles.button}
+            onClick={deleteRecruitHandler}
+          >
             삭제하기
           </Button>
           <Button
@@ -81,12 +102,12 @@ export default function ActionSelectorButtons({
           <FormControlLabel
             control={
               <Switch
-                checked={isEnded}
+                checked={!isFinish}
                 onChange={switchChangeHandler}
                 inputProps={{ 'aria-label': 'controlled' }}
               />
             }
-            label={isEnded ? '완료' : '모집중'}
+            label={isFinish ? '모집완료' : '모집중'}
           />
           <Button
             variant='contained'

From c494429e171b85ae3e50836a259a4fae7b8f1a99 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Mon, 8 Apr 2024 21:12:35 +0900
Subject: [PATCH 12/28] =?UTF-8?q?[Feat]=20=EB=AA=A8=EC=A7=91=20=EA=B3=B5?=
 =?UTF-8?q?=EA=B3=A0=20=EB=B2=84=ED=8A=BC=EC=9D=84=20MUI=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/admin/recruitments/RecruitmentsMain.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/admin/recruitments/RecruitmentsMain.tsx b/components/admin/recruitments/RecruitmentsMain.tsx
index edf5076c4..b00d660de 100644
--- a/components/admin/recruitments/RecruitmentsMain.tsx
+++ b/components/admin/recruitments/RecruitmentsMain.tsx
@@ -1,4 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
+import { Button } from '@mui/material';
 import { RecruitmentsMainProps } from 'types/admin/adminRecruitmentsTypes';
 import styles from 'styles/admin/store/StoreMain.module.scss';
 import RecruitmentsHistoryList from './RecruitmentsHistoryList';
@@ -8,14 +9,15 @@ function RecruitmentsMain({ setPage }: RecruitmentsMainProps) {
   return (
     <div className={styles.mainContainer}>
       <div className={styles.subContainer}>
-        <button
+        <Button
+          variant='contained'
           className={styles.sectionTitle}
           onClick={() => {
             setPage({ pageType: 'EDIT', props: { mode: 'CREATE', setPage } });
           }}
         >
-          지원 공고 등록
-        </button>
+          새 모집공고 등록
+        </Button>
       </div>
       <div className={styles.subContainer}>
         <div className={styles.sectionTitle}>변경 이력</div>

From dbb4ada73807f0c90e69ccfd2d369d561a5e48dd Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Mon, 8 Apr 2024 21:17:46 +0900
Subject: [PATCH 13/28] =?UTF-8?q?[Fix]=20MUI=20IconButton=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruitments/recruitmentsEdit/RecruitmentEdit.tsx    | 9 ++++++---
 .../components/ActionSelectorButtons.tsx                 | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx b/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
index 5021ceab1..dfba4bf36 100644
--- a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
@@ -1,3 +1,5 @@
+import HomeIcon from '@mui/icons-material/Home';
+import { IconButton } from '@mui/material';
 import {
   Iquestion,
   Irecruit,
@@ -37,13 +39,14 @@ export default function RecruitmentEdit({
 
   return (
     <div className={styles.container}>
-      <button
+      <IconButton
+        aria-label='메인으로 가기'
         onClick={() => {
           setPage({ pageType: 'MAIN', props: null });
         }}
       >
-        메인으로가기
-      </button>
+        <HomeIcon />
+      </IconButton>
       <TitleTimeRangeSelector
         recruitmentEditInfo={recruitmentEditInfo}
         setRecruitmentEditInfoField={setRecruitmentEditInfoField}
diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index d9a1c12f4..3638d14e5 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -5,6 +5,7 @@ import MoreHorizIcon from '@mui/icons-material/MoreHoriz';
 import {
   Button,
   FormControl,
+  IconButton,
   InputLabel,
   MenuItem,
   Select,
@@ -126,9 +127,9 @@ export default function ActionSelectorButtons({
               });
             })}
             {hasNextPage && (
-              <Button onClick={() => fetchNextPage()}>
+              <IconButton aria-label='더보기' onClick={() => fetchNextPage()}>
                 <MoreHorizIcon />
-              </Button>
+              </IconButton>
             )}
             {/* {recruitmentsHistory.length === 0 ? (
               <MenuItem key={-1} value={-1}>

From 6949fee78d12944dc977b910c363bf05635dc81b Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Tue, 9 Apr 2024 18:03:02 +0900
Subject: [PATCH 14/28] =?UTF-8?q?[Fix]=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20Imp?=
 =?UTF-8?q?ort=20=EC=A0=9C=EA=B1=B0=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuillDescriptionViewer.tsx                   | 5 -----
 .../recruitmentsEdit/components/QuillDescriptionEditor.tsx  | 1 -
 .../recruitmentsEdit/components/TitleTimeRangeSelector.tsx  | 6 ------
 3 files changed, 12 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx b/components/admin/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
index 7c5c7b778..4fadb0ab1 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/components/QuillDescriptionViewer.tsx
@@ -5,11 +5,6 @@ import 'react-quill/dist/quill.snow.css';
 import DynamicQuill from 'components/DynamicQuill';
 import styles from 'styles/admin/recruitments/recruitmentDetail/components/QuillDescription.module.scss';
 
-const Quill = dynamic(() => import('react-quill'), {
-  ssr: false,
-  loading: () => <p>Loading ...</p>,
-});
-
 interface QuillDescriptionViewerProps {
   contents: string;
 }
diff --git a/components/admin/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx b/components/admin/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
index ef43b5c52..b83f10c64 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/QuillDescriptionEditor.tsx
@@ -1,4 +1,3 @@
-import dynamic from 'next/dynamic';
 import { Paper } from '@mui/material';
 import { QUILL_EDIT_MODULES, QUILL_FORMATS } from 'types/quillTypes';
 import 'react-quill/dist/quill.snow.css';
diff --git a/components/admin/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx b/components/admin/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
index 91a6c4b67..d28471e62 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/TitleTimeRangeSelector.tsx
@@ -1,4 +1,3 @@
-import { SyntheticEvent } from 'react';
 import DatePicker from 'react-datepicker';
 import {
   Paper,
@@ -9,11 +8,6 @@ import {
   TableRow,
 } from '@mui/material';
 import { Irecruit } from 'types/admin/adminRecruitmentsTypes';
-import {
-  dateToKRLocaleTimeString,
-  dateToString,
-  dateToStringShort,
-} from 'utils/handleTime';
 import { AdminTableHead } from 'components/admin/common/AdminTable';
 import styles from 'styles/admin/recruitments/recruitmentEdit/components/TitleTimeRangeSelector.module.scss';
 

From 710c4e455aa56e60dcbbd187a55da19efe6b9720 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Tue, 9 Apr 2024 18:10:40 +0900
Subject: [PATCH 15/28] =?UTF-8?q?[Fix]=20status=20->=20isFinish=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruitments/recruitmentsDetail/RecruitmentDetail.tsx  | 2 +-
 .../components/ActionSelectorButtons.tsx                   | 7 +++----
 types/admin/adminRecruitmentsTypes.ts                      | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
index bfba5d331..5e922441b 100644
--- a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
@@ -36,7 +36,7 @@ export default function RecruitmentDetail({
       const res = await instance.get(`admin/recruitments/${recruit.id}`);
       const data: Irecruit = {
         id: recruit.id,
-        status: recruit.status,
+        isFinish: recruit.isFinish,
         title: res.data.title,
         startDate: new Date(res.data.startDate),
         endDate: new Date(res.data.endDate),
diff --git a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
index 03c4738ce..79e680bed 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
@@ -19,11 +19,10 @@ interface ActionSelectorButtonsProps {
 export default function ActionSelectorButtons({
   setPage,
   recruitmentInfo,
-  actionType,
 }: ActionSelectorButtonsProps) {
-  const STATE = recruitmentInfo.status === '모집중' ? false : true;
-
-  const [isFinish, setIsFinish] = useState<boolean>(STATE);
+  const [isFinish, setIsFinish] = useState<boolean>(
+    recruitmentInfo.isFinish as boolean
+  );
 
   const isStarted = recruitmentInfo.startDate > new Date();
   const setSnackBar = useSetRecoilState(toastState);
diff --git a/types/admin/adminRecruitmentsTypes.ts b/types/admin/adminRecruitmentsTypes.ts
index 2ba4ff056..16d38e84e 100644
--- a/types/admin/adminRecruitmentsTypes.ts
+++ b/types/admin/adminRecruitmentsTypes.ts
@@ -6,7 +6,7 @@ export interface Irecruit {
   endDate: Date;
   title: string;
   contents?: string;
-  status?: '모집전' | '모집중' | '완료';
+  isFinish?: boolean;
   generation: string;
   form?: Array<Iquestion>;
 }

From d1ae482eb7fb7c4a177f7fcdec8fcc26eb32b146 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Tue, 9 Apr 2024 19:36:49 +0900
Subject: [PATCH 16/28] =?UTF-8?q?[Feat]=20=EC=A7=88=EB=AC=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EC=8B=9C=20=EC=B6=94=EA=B0=80=EB=90=9C=20?=
 =?UTF-8?q?=EC=A7=88=EB=AC=B8=EC=9C=BC=EB=A1=9C=20scroll=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ActionSelectorButtons.tsx      | 11 ------
 .../components/QuestionFormBuilder.tsx        | 37 +++++++++++--------
 hooks/recruitments/useRecruitmentEditInfo.ts  |  2 +-
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index 3638d14e5..c23001d76 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -131,17 +131,6 @@ export default function ActionSelectorButtons({
                 <MoreHorizIcon />
               </IconButton>
             )}
-            {/* {recruitmentsHistory.length === 0 ? (
-              <MenuItem key={-1} value={-1}>
-                기존 공고가 없습니다.
-              </MenuItem>
-            ) : (
-              recruitmentsHistory.map((recruit: Irecruit) => (
-                <MenuItem key={recruit.id} value={recruit.id}>
-                  {recruit.title}
-                </MenuItem>
-              ))
-            )} */}
           </Select>
         </FormControl>
         <Button
diff --git a/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx b/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
index c7c800138..079e758be 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import { DropResult } from 'react-beautiful-dnd';
 import { CheckBox } from '@mui/icons-material';
 import AddIcon from '@mui/icons-material/Add';
@@ -237,14 +237,16 @@ export default function QuestionFormBuilder({
     number | null
   >(null);
 
+  const questionRef = useRef<Array<HTMLDivElement | null>>([]);
+
   const addQuestionHandler = () => {
-    if (focusedQuestionIdx === null) {
-      formManager.addEmptyQuestion(form.length - 1, 'TEXT');
-      setFocusedQuestion(form.length);
-    } else {
-      formManager.addEmptyQuestion(focusedQuestionIdx, 'TEXT');
-      setFocusedQuestion(focusedQuestionIdx + 1);
-    }
+    if (focusedQuestionIdx === null) setFocusedQuestion(form.length - 1);
+
+    formManager.addEmptyQuestion(focusedQuestionIdx as number, 'TEXT');
+    setFocusedQuestion((focusedQuestionIdx as number) + 1);
+    questionRef.current[(focusedQuestionIdx as number) - 1]?.scrollIntoView({
+      behavior: 'smooth',
+    });
   };
 
   const onDragEndHandler = ({ destination, source }: DropResult) => {
@@ -260,14 +262,17 @@ export default function QuestionFormBuilder({
           {form &&
             form.map((question, idx) => {
               return (
-                <Question
-                  key={idx}
-                  idx={idx}
-                  question={question}
-                  formManager={formManager}
-                  isFocused={focusedQuestionIdx === idx}
-                  setFocusedQuestion={setFocusedQuestion}
-                />
+                <>
+                  <Question
+                    key={idx}
+                    idx={idx}
+                    question={question}
+                    formManager={formManager}
+                    isFocused={focusedQuestionIdx === idx}
+                    setFocusedQuestion={setFocusedQuestion}
+                  />
+                  <div ref={(el) => (questionRef.current[idx] = el)}></div>
+                </>
               );
             })}
         </DraggableList>
diff --git a/hooks/recruitments/useRecruitmentEditInfo.ts b/hooks/recruitments/useRecruitmentEditInfo.ts
index 940ab8c27..adc5fbea9 100644
--- a/hooks/recruitments/useRecruitmentEditInfo.ts
+++ b/hooks/recruitments/useRecruitmentEditInfo.ts
@@ -198,7 +198,7 @@ export default function useRecruitmentEditInfo(
   const importRecruitmentInfo = async (recruitId: number) => {
     if (recruitId <= 0) return;
     try {
-      const res = await instance.get('/recruitments/' + recruitId);
+      const res = await instance.get('/admin/recruitments/' + recruitId);
       const data: Irecruit = {
         title: res.data.title,
         startDate: new Date(res.data.startDate),

From f01b23c792b766f95ea5a4c89bb7bb469da22b26 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Tue, 9 Apr 2024 19:44:11 +0900
Subject: [PATCH 17/28] =?UTF-8?q?[Feat]=20=EC=83=9D=EC=84=B1=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=8B=9C=20=EB=A9=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruitmentsEdit/RecruitmentEdit.tsx           |  1 +
 .../components/ActionSelectorButtons.tsx           | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx b/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
index dfba4bf36..ca2e5cb8b 100644
--- a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
@@ -63,6 +63,7 @@ export default function RecruitmentEdit({
         recruitmentEditInfo={recruitmentEditInfo}
         importRecruitmentInfo={importRecruitmentInfo}
         actionType={mode}
+        setPage={setPage}
       />
     </div>
   );
diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index c23001d76..1f7b8f7d6 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { More } from '@mui/icons-material';
 import MoreHorizIcon from '@mui/icons-material/MoreHoriz';
@@ -11,7 +11,11 @@ import {
   Select,
   SelectChangeEvent,
 } from '@mui/material';
-import { Irecruit, recruitListData } from 'types/admin/adminRecruitmentsTypes';
+import {
+  Irecruit,
+  RecruitmentsPages,
+  recruitListData,
+} from 'types/admin/adminRecruitmentsTypes';
 import { instance } from 'utils/axios';
 import { dateToDateTimeLocalString } from 'utils/handleTime';
 import { InfiniteScroll } from 'utils/infinityScroll';
@@ -33,12 +37,14 @@ interface ActionSelectorButtonsProps {
   recruitmentEditInfo: Irecruit;
   importRecruitmentInfo: (recruitId: number) => void;
   actionType: 'CREATE' | 'MODIFY';
+  setPage: Dispatch<SetStateAction<RecruitmentsPages>>;
 }
 
 export default function ActionSelectorButtons({
   recruitmentEditInfo,
   importRecruitmentInfo,
   actionType,
+  setPage,
 }: ActionSelectorButtonsProps) {
   const [selectedId, setSelectedId] = useState<string>('');
 
@@ -65,6 +71,8 @@ export default function ActionSelectorButtons({
         contents: recruitmentEditInfo.contents,
         form: recruitmentEditInfo.form,
       });
+      alert('수정이 완료되었습니다.');
+      setPage({ pageType: 'MAIN', props: null });
     } catch (e: any) {
       setSnackBar({
         toastName: 'post recruitment',
@@ -88,6 +96,8 @@ export default function ActionSelectorButtons({
           form: recruitmentEditInfo.form,
         }
       );
+      alert('수정이 완료되었습니다.');
+      setPage({ pageType: 'MAIN', props: null });
     } catch (e: any) {
       setSnackBar({
         toastName: 'put recruitment',

From 07852e32d5abde413b529f8073fcc3c3e265bb02 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Tue, 9 Apr 2024 20:10:29 +0900
Subject: [PATCH 18/28] =?UTF-8?q?[Feat]=20=EC=82=AD=EC=A0=9C=EC=8B=9C=20?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20#12?=
 =?UTF-8?q?56?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruitmentsDetail/RecruitmentDetail.tsx      | 15 ++++++++-------
 .../components/ActionSelectorButtons.tsx          |  5 +++--
 .../components/ActionSelectorButtons.tsx          |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
index 5e922441b..e70c254f4 100644
--- a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
@@ -1,10 +1,11 @@
 import { useEffect, useState } from 'react';
 import { useSetRecoilState } from 'recoil';
+import HomeIcon from '@mui/icons-material/Home';
+import { IconButton } from '@mui/material';
 import {
   Iquestion,
   Irecruit,
   RecruitmentDetailProps,
-  RecruitmentsMainProps,
 } from 'types/admin/adminRecruitmentsTypes';
 import { instance } from 'utils/axios';
 import { toastState } from 'utils/recoil/toast';
@@ -42,7 +43,7 @@ export default function RecruitmentDetail({
         endDate: new Date(res.data.endDate),
         generation: res.data.generation,
         contents: res.data.contents,
-        form: res.data.form,
+        form: res.data.forms,
       };
       setRecruitmentInfo(data);
       setIsLoading(false);
@@ -62,14 +63,14 @@ export default function RecruitmentDetail({
 
   return (
     <div className={styles.container}>
-      <button
+      <IconButton
+        aria-label='메인으로 가기'
         onClick={() => {
-          const props = { setPage: setPage } as RecruitmentsMainProps;
-          setPage({ pageType: 'MAIN', props: props });
+          setPage({ pageType: 'MAIN', props: null });
         }}
       >
-        홈으로 돌아가기
-      </button>
+        <HomeIcon />
+      </IconButton>
       {isLoading ? (
         <p>로딩중...</p>
       ) : (
diff --git a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
index 79e680bed..b281ff3ca 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/components/ActionSelectorButtons.tsx
@@ -43,7 +43,8 @@ export default function ActionSelectorButtons({
       const res = await instance.delete(
         `/admin/recruitments/${recruitmentInfo.id}`
       );
-      console.log(res);
+      alert('성공적으로 삭제가 완료되었습니다.');
+      setPage({ pageType: 'MAIN', props: null });
     } catch (e: any) {
       setSnackBar({
         toastName: 'post recruitment',
@@ -60,7 +61,7 @@ export default function ActionSelectorButtons({
   ) => {
     try {
       const res = await instance.patch(
-        `/admin/recruitments/${recruitmentInfo.id}/statu`,
+        `/admin/recruitments/${recruitmentInfo.id}/status`,
         {
           finish: !checked,
         }
diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index 1f7b8f7d6..9288ea90b 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -71,7 +71,7 @@ export default function ActionSelectorButtons({
         contents: recruitmentEditInfo.contents,
         form: recruitmentEditInfo.form,
       });
-      alert('수정이 완료되었습니다.');
+      alert('공고를 성공적을 생성하였습니다.');
       setPage({ pageType: 'MAIN', props: null });
     } catch (e: any) {
       setSnackBar({

From 349c34fed12262c481d3162f3009dbdeb33f439d Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Wed, 10 Apr 2024 13:13:48 +0900
Subject: [PATCH 19/28] =?UTF-8?q?[Fix]=20instanceInManage=EB=A5=BC=20insta?=
 =?UTF-8?q?nce=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/recruitments/recruitmentsuser/tmplateEditor.tsx     | 4 ++--
 components/modal/admin/AdminRecruitMessageTemplateModal.tsx   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
index 233f9cc99..44c18318c 100644
--- a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
+++ b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { IRecruitMessageTemplate } from 'types/recruit/recruitments';
-import { instanceInManage } from 'utils/axios';
+import { instance } from 'utils/axios';
 import { toastState } from 'utils/recoil/toast';
 import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
 
@@ -42,7 +42,7 @@ function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
       return;
     }
     try {
-      await instanceInManage.post('/recruitments/result/message', template);
+      await instance.post('admin/recruitments/result/message', template);
       setSnackbar({
         toastName: `post request`,
         severity: 'success',
diff --git a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx b/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
index ab8320db1..297f77948 100644
--- a/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
+++ b/components/modal/admin/AdminRecruitMessageTemplateModal.tsx
@@ -4,7 +4,7 @@ import {
   IRecruitmentTemplate,
   RecruitmentMessageType,
 } from 'types/recruit/recruitments';
-import { instanceInManage } from 'utils/axios';
+import { instance } from 'utils/axios';
 import { toastState } from 'utils/recoil/toast';
 import TemplateEditor from 'components/admin/recruitments/recruitmentsuser/tmplateEditor';
 import styles from 'styles/admin/modal/AdminRecruitMessageTemplateModal.module.scss';
@@ -19,7 +19,7 @@ function AdminRecruitMessageTemplateModal() {
   });
   const getTemplates = async () => {
     try {
-      const res = await instanceInManage.get('/recruitments/result/message');
+      const res = await instance.get('admin/recruitments/result/message');
       const messages = res.data.messages
         .filter((message: IRecruitmentTemplate) => message.isUse)
         .reduce(

From 7521b94b77ff11d979f11e6c6448b81f00e7775f Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Wed, 10 Apr 2024 15:55:27 +0900
Subject: [PATCH 20/28] =?UTF-8?q?[Fix]=20alert=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/recruitments/recruitmentsuser/tmplateEditor.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
index 44c18318c..d2ca72ec9 100644
--- a/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
+++ b/components/admin/recruitments/recruitmentsuser/tmplateEditor.tsx
@@ -10,7 +10,7 @@ function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
     messageType: messageType,
     content: content,
   });
-  const [alert, setAlert] = useState<string>('');
+  const [alert, setAlert] = useState<string>('새로운 내용을 입력해주세요');
   const setSnackbar = useSetRecoilState(toastState);
   const titles = {
     INTERVIEW: '면접',
@@ -36,7 +36,7 @@ function TemplateEditor({ messageType, content }: IRecruitMessageTemplate) {
       setSnackbar({
         toastName: `alert`,
         severity: 'error',
-        message: `치환 문구가 필요합니다.`,
+        message: alert,
         clicked: true,
       });
       return;

From 2a8e2a5a3fddfcf1f65f47456730ef14e4e54404 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Wed, 10 Apr 2024 16:52:42 +0900
Subject: [PATCH 21/28] =?UTF-8?q?[Fix]=20=EB=B0=94=EB=80=90=20API=20?=
 =?UTF-8?q?=EC=8A=A4=ED=8E=99=EC=97=90=20=EB=A7=9E=EC=B6=94=EC=96=B4=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruitmentsDetail/RecruitmentDetail.tsx  |  6 +--
 .../components/QuestionForm.tsx               | 19 +++----
 .../recruitmentsEdit/RecruitmentEdit.tsx      |  4 +-
 .../components/ActionSelectorButtons.tsx      |  4 +-
 .../components/QuestionFormBuilder.tsx        |  4 +-
 hooks/recruitments/useRecruitmentEditInfo.ts  | 50 +++++++++----------
 .../recruitments/useRecruitmentUserFilter.ts  |  4 +-
 types/admin/adminRecruitmentsTypes.ts         |  6 +--
 8 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
index e70c254f4..cf31a3d7c 100644
--- a/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/RecruitmentDetail.tsx
@@ -25,7 +25,7 @@ export default function RecruitmentDetail({
     endDate: new Date(),
     generation: '',
     contents: '',
-    form: [],
+    forms: [],
   });
 
   const [isLoading, setIsLoading] = useState<boolean>(true);
@@ -43,7 +43,7 @@ export default function RecruitmentDetail({
         endDate: new Date(res.data.endDate),
         generation: res.data.generation,
         contents: res.data.contents,
-        form: res.data.forms,
+        forms: res.data.forms,
       };
       setRecruitmentInfo(data);
       setIsLoading(false);
@@ -84,7 +84,7 @@ export default function RecruitmentDetail({
           <QuillDescriptionViewer
             contents={recruitmentInfo.contents as string}
           />
-          <QuestionForm form={recruitmentInfo.form as Iquestion[]} />
+          <QuestionForm form={recruitmentInfo.forms as Iquestion[]} />
         </>
       )}
     </div>
diff --git a/components/admin/recruitments/recruitmentsDetail/components/QuestionForm.tsx b/components/admin/recruitments/recruitmentsDetail/components/QuestionForm.tsx
index a93a65b92..a25134e66 100644
--- a/components/admin/recruitments/recruitmentsDetail/components/QuestionForm.tsx
+++ b/components/admin/recruitments/recruitmentsDetail/components/QuestionForm.tsx
@@ -18,15 +18,8 @@ function MultiCheckInput({ checkList }: CheckInputProps) {
               <Grid item xs={1} alignItems='center'>
                 <CheckBox />
               </Grid>
-              <Grid item xs={10}>
-                <TextField
-                  fullWidth
-                  required
-                  label='직접입력'
-                  value={checkItem.content}
-                  size='small'
-                  variant='standard'
-                />
+              <Grid item xs={10} alignContent={'center'}>
+                <div>{checkItem.contents}</div>
               </Grid>
             </Grid>
           );
@@ -45,15 +38,16 @@ function SingleCheckInput({ checkList }: CheckInputProps) {
               <Grid item xs={1}>
                 <Radio value={idx} />
               </Grid>
-              <Grid item xs={10}>
-                <TextField
+              <Grid item xs={10} alignContent={'center'}>
+                <div>{checkItem.contents}</div>
+                {/* <TextField
                   fullWidth
                   required
                   label='직접입력'
                   value={checkItem.content}
                   size='small'
                   variant='standard'
-                />
+                /> */}
               </Grid>
             </Grid>
           );
@@ -82,6 +76,7 @@ function Question({ question }: QuestionProps) {
             fullWidth
             value={question.question}
             size='small'
+            disabled
           />
         </Grid>
         <Grid item xs={12}>
diff --git a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx b/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
index ca2e5cb8b..48843ac0a 100644
--- a/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/RecruitmentEdit.tsx
@@ -18,7 +18,7 @@ const emptyRecruitmentEditInfo: Irecruit = {
   endDate: new Date(),
   generation: '',
   contents: '',
-  form: [],
+  forms: [],
 };
 
 export default function RecruitmentEdit({
@@ -56,7 +56,7 @@ export default function RecruitmentEdit({
         setRecruitmentEditInfoField={setRecruitmentEditInfoField}
       />
       <QuestionFormBuilder
-        form={recruitmentEditInfo.form as Iquestion[]}
+        form={recruitmentEditInfo.forms as Iquestion[]}
         formManager={formManager}
       />
       <ActionSelectorButtons
diff --git a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
index 9288ea90b..6e76746f7 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/ActionSelectorButtons.tsx
@@ -69,7 +69,7 @@ export default function ActionSelectorButtons({
         endDate: dateToDateTimeLocalString(recruitmentEditInfo.endDate),
         generation: recruitmentEditInfo.generation,
         contents: recruitmentEditInfo.contents,
-        form: recruitmentEditInfo.form,
+        forms: recruitmentEditInfo.forms,
       });
       alert('공고를 성공적을 생성하였습니다.');
       setPage({ pageType: 'MAIN', props: null });
@@ -93,7 +93,7 @@ export default function ActionSelectorButtons({
           endDate: dateToDateTimeLocalString(recruitmentEditInfo.endDate),
           generation: recruitmentEditInfo.generation,
           contents: recruitmentEditInfo.contents,
-          form: recruitmentEditInfo.form,
+          forms: recruitmentEditInfo.forms,
         }
       );
       alert('수정이 완료되었습니다.');
diff --git a/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx b/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
index 079e758be..3990280b0 100644
--- a/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
+++ b/components/admin/recruitments/recruitmentsEdit/components/QuestionFormBuilder.tsx
@@ -55,7 +55,7 @@ function MultiCheckInput({
                   fullWidth
                   required
                   label='직접입력'
-                  value={checkItem.content}
+                  value={checkItem.contents}
                   size='small'
                   variant='standard'
                   onChange={(e) => inputChangeHandler(e, idx)}
@@ -111,7 +111,7 @@ function SingleCheckInput({
                   fullWidth
                   required
                   label='직접입력'
-                  value={checkItem.content}
+                  value={checkItem.contents}
                   size='small'
                   variant='standard'
                   onChange={(e) => inputChangeHandler(e, idx)}
diff --git a/hooks/recruitments/useRecruitmentEditInfo.ts b/hooks/recruitments/useRecruitmentEditInfo.ts
index adc5fbea9..ca1030d42 100644
--- a/hooks/recruitments/useRecruitmentEditInfo.ts
+++ b/hooks/recruitments/useRecruitmentEditInfo.ts
@@ -9,7 +9,7 @@ import { instance } from 'utils/axios';
 import { toastState } from 'utils/recoil/toast';
 
 export interface IFormManager {
-  setQuestionContent: (questionIdx: number, content: string) => void;
+  setQuestionContent: (questionIdx: number, contents: string) => void;
   setCheckItemContent: (
     questionIdx: number,
     checkItemIdx: number,
@@ -29,8 +29,8 @@ export interface IFormManager {
 export default function useRecruitmentEditInfo(
   initRecruitmentEditInfo: Irecruit
 ) {
-  if (initRecruitmentEditInfo.form === undefined) {
-    initRecruitmentEditInfo.form = new Array<Iquestion>();
+  if (initRecruitmentEditInfo.forms === undefined) {
+    initRecruitmentEditInfo.forms = new Array<Iquestion>();
   }
 
   const [recruitmentEditInfo, setRecruitmentEditInfo] = useState<Irecruit>(
@@ -44,8 +44,8 @@ export default function useRecruitmentEditInfo(
   };
 
   const setQuestionContent = (questionIdx: number, content: string) => {
-    if (!recruitmentEditInfo.form) return;
-    const updatedForm = [...recruitmentEditInfo.form];
+    if (!recruitmentEditInfo.forms) return;
+    const updatedForm = [...recruitmentEditInfo.forms];
     const question = updatedForm[questionIdx];
     question.question = content;
 
@@ -57,20 +57,20 @@ export default function useRecruitmentEditInfo(
     checkItemIdx: number,
     contents: string
   ) => {
-    if (!recruitmentEditInfo.form) return;
-    const updatedForm = [...recruitmentEditInfo.form];
+    if (!recruitmentEditInfo.forms) return;
+    const updatedForm = [...recruitmentEditInfo.forms];
     const question = updatedForm[questionIdx];
     if (!question.checkList) return;
 
     const checkItem = question.checkList[checkItemIdx];
-    checkItem.content = contents;
+    checkItem.contents = contents;
 
     updateRecruitFrom(updatedForm);
   };
 
   const addEmptyQuestion = (questionIdx: number, inputType: string) => {
-    if (!recruitmentEditInfo.form) return;
-    const updatedForm = [...recruitmentEditInfo.form];
+    if (!recruitmentEditInfo.forms) return;
+    const updatedForm = [...recruitmentEditInfo.forms];
     const question = makeEmptyQuestion(inputType);
     if (!question) return;
 
@@ -80,19 +80,19 @@ export default function useRecruitmentEditInfo(
   };
 
   const removeQuestion = (questionIdx: number) => {
-    if (!recruitmentEditInfo.form) return;
-    const updatedForm = [...recruitmentEditInfo.form];
+    if (!recruitmentEditInfo.forms) return;
+    const updatedForm = [...recruitmentEditInfo.forms];
     updatedForm.splice(questionIdx, 1);
 
     updateRecruitFrom(updatedForm);
   };
 
   const addCheckItemToQuestion = (questionIdx: number) => {
-    if (!recruitmentEditInfo.form) return;
+    if (!recruitmentEditInfo.forms) return;
     const checkItem: IcheckItem = {
-      content: '',
+      contents: '',
     };
-    const updatedForm = [...recruitmentEditInfo.form];
+    const updatedForm = [...recruitmentEditInfo.forms];
     const question = updatedForm[questionIdx];
 
     if (!question) return;
@@ -115,8 +115,8 @@ export default function useRecruitmentEditInfo(
     checkItemIdx: number,
     questionIdx: number
   ) => {
-    if (!recruitmentEditInfo.form) return;
-    const updatedForm = [...recruitmentEditInfo.form];
+    if (!recruitmentEditInfo.forms) return;
+    const updatedForm = [...recruitmentEditInfo.forms];
     const question = updatedForm[questionIdx];
     if (!question) return;
 
@@ -127,8 +127,8 @@ export default function useRecruitmentEditInfo(
   };
 
   const changeQuestionInputType = (questionIdx: number, inputType: string) => {
-    if (!recruitmentEditInfo.form) return;
-    const updatedForm = [...recruitmentEditInfo.form];
+    if (!recruitmentEditInfo.forms) return;
+    const updatedForm = [...recruitmentEditInfo.forms];
     const question = updatedForm[questionIdx];
 
     if (!question) return;
@@ -142,8 +142,8 @@ export default function useRecruitmentEditInfo(
   };
 
   const switchQuestionIndex = (questionIdx: number, targetIdx: number) => {
-    if (!recruitmentEditInfo.form) return;
-    const updatedForm = [...recruitmentEditInfo.form];
+    if (!recruitmentEditInfo.forms) return;
+    const updatedForm = [...recruitmentEditInfo.forms];
     const question = updatedForm[questionIdx];
     if (!question) return;
 
@@ -156,7 +156,7 @@ export default function useRecruitmentEditInfo(
   function updateRecruitFrom(updatedForm: Iquestion[]) {
     setRecruitmentEditInfo({
       ...recruitmentEditInfo,
-      form: updatedForm,
+      forms: updatedForm,
     });
   }
 
@@ -205,10 +205,10 @@ export default function useRecruitmentEditInfo(
         endDate: new Date(res.data.endDate),
         generation: res.data.generation,
         contents: res.data.contents,
-        form: res.data.form,
+        forms: res.data.forms,
       };
-      if (data.form === undefined) {
-        data.form = new Array<Iquestion>();
+      if (data.forms === undefined) {
+        data.forms = new Array<Iquestion>();
       }
       setRecruitmentEditInfo(data);
     } catch (e: any) {
diff --git a/hooks/recruitments/useRecruitmentUserFilter.ts b/hooks/recruitments/useRecruitmentUserFilter.ts
index 51c061d25..6e17442d2 100644
--- a/hooks/recruitments/useRecruitmentUserFilter.ts
+++ b/hooks/recruitments/useRecruitmentUserFilter.ts
@@ -61,8 +61,8 @@ const useRecruitmentUserFilter = (recruitId: number, currentPage?: number) => {
   }, [currentPage, searchString, checklistIds]);
 
   const questions = recruitUserData.applicationResults?.reduce(
-    (acc: string[], application: { form: { question: string }[] }) => {
-      application.form.forEach(({ question }) => {
+    (acc: string[], application: { forms: { question: string }[] }) => {
+      application.forms.forEach(({ question }) => {
         if (acc.indexOf(question) === -1) {
           acc.push(question);
         }
diff --git a/types/admin/adminRecruitmentsTypes.ts b/types/admin/adminRecruitmentsTypes.ts
index 16d38e84e..1d51e0bdb 100644
--- a/types/admin/adminRecruitmentsTypes.ts
+++ b/types/admin/adminRecruitmentsTypes.ts
@@ -8,7 +8,7 @@ export interface Irecruit {
   contents?: string;
   isFinish?: boolean;
   generation: string;
-  form?: Array<Iquestion>;
+  forms?: Array<Iquestion>;
 }
 
 // 지원서 질문 interface (응답 전)
@@ -23,7 +23,7 @@ export interface Iquestion {
 export interface IcheckItem {
   checkId?: number;
   sortNum?: number;
-  content: string;
+  contents: string;
 }
 
 export interface Inotication {
@@ -57,7 +57,7 @@ export interface IrecruitUserTable {
   applicationId: number;
   intraId: string;
   status?: '합격' | '불합격' | '심사중';
-  form: IuserFormResponse[];
+  forms: IuserFormResponse[];
 }
 
 export interface IrecruitArrayTable {

From 1819abb944f6ee3ae1e93e5632604221db985f81 Mon Sep 17 00:00:00 2001
From: kimjaehyuk <jhkim0097@gmail.com>
Date: Wed, 10 Apr 2024 16:55:03 +0900
Subject: [PATCH 22/28] =?UTF-8?q?[Fix]=20=EB=B0=94=EB=80=90=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=EC=97=90=20=EB=A7=9E=EC=B6=94=EC=96=B4=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95=20#1256?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruitments/recruitmentsuser/FilterOptions.tsx    |  4 ++--
 .../recruitments/recruitmentsuser/renderTableCells.tsx | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/FilterOptions.tsx b/components/admin/recruitments/recruitmentsuser/FilterOptions.tsx
index 7bc81c8a7..461f53663 100644
--- a/components/admin/recruitments/recruitmentsuser/FilterOptions.tsx
+++ b/components/admin/recruitments/recruitmentsuser/FilterOptions.tsx
@@ -38,7 +38,7 @@ function FilterQptionsUI(
   useEffect(() => {
     setAnswers(
       recruitUserData.reduce((acc, recruit) => {
-        recruit.form.forEach((formItem) => {
+        recruit.forms.forEach((formItem) => {
           if (formItem.inputType !== 'TEXT') {
             formItem.checkedList?.forEach((item) => {
               if (!acc.some((answer) => answer.checkId === item.checkId)) {
@@ -71,7 +71,7 @@ function FilterQptionsUI(
           >
             {answers.map((answer: IcheckItem, index) => (
               <MenuItem key={index} value={answer.checkId}>
-                <ListItemText primary={answer.content} />
+                <ListItemText primary={answer.contents} />
               </MenuItem>
             ))}
           </Select>
diff --git a/components/admin/recruitments/recruitmentsuser/renderTableCells.tsx b/components/admin/recruitments/recruitmentsuser/renderTableCells.tsx
index 81ee30ed0..012d8a24a 100644
--- a/components/admin/recruitments/recruitmentsuser/renderTableCells.tsx
+++ b/components/admin/recruitments/recruitmentsuser/renderTableCells.tsx
@@ -46,16 +46,16 @@ const ExpandableTableRow: React.FC<ExpandableTableRowProps> = ({
 
 function renderTableCells(recruit: IrecruitUserTable, questions: string[]) {
   const answers = questions.map((question) => {
-    const formItem = recruit.form.find((form) => form.question === question);
+    const formItem = recruit.forms.find((form) => form.question === question);
     if (!formItem) return 'N/A';
 
     switch (formItem.inputType) {
       case 'TEXT':
         return formItem.answer;
       case 'SINGLE_CHECK':
-        return formItem.checkedList?.map((item) => item.content).join(', ');
+        return formItem.checkedList?.map((item) => item.contents).join(', ');
       case 'MULTI_CHECK':
-        return formItem.checkedList?.map((item) => item.content).join(', ');
+        return formItem.checkedList?.map((item) => item.contents).join(', ');
       default:
         return 'N/A';
     }
@@ -72,12 +72,12 @@ function renderTableCells(recruit: IrecruitUserTable, questions: string[]) {
           <div>
             <strong>status:</strong> {recruit.status}
           </div>
-          {recruit.form.map((form, index) => (
+          {recruit.forms.map((form, index) => (
             <div key={index}>
               <strong>{form.question}</strong>:{' '}
               {form.answer
                 ? form.answer
-                : form.checkedList?.map((item) => item.content).join(', ')}
+                : form.checkedList?.map((item) => item.contents).join(', ')}
             </div>
           ))}
         </div>

From b8d0414dc6f4de0e96e4de761b54b8317de24ec3 Mon Sep 17 00:00:00 2001
From: yoouyeon <jyeon.yoon59@gmail.com>
Date: Fri, 12 Apr 2024 20:32:48 +0900
Subject: [PATCH 23/28] =?UTF-8?q?[Feat]=20=EA=B3=B5=EA=B3=A0=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20url=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/recruit/RecruitList/RecruitListItem.tsx | 2 +-
 pages/recruit/{[id]/index.tsx => detail.tsx}       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pages/recruit/{[id]/index.tsx => detail.tsx} (95%)

diff --git a/components/recruit/RecruitList/RecruitListItem.tsx b/components/recruit/RecruitList/RecruitListItem.tsx
index dcf6c90b7..712d35674 100644
--- a/components/recruit/RecruitList/RecruitListItem.tsx
+++ b/components/recruit/RecruitList/RecruitListItem.tsx
@@ -8,7 +8,7 @@ const RecruitListItem = ({ recruit }: { recruit: recruitment }) => {
   const router = useRouter();
   return (
     <ListItemButton
-      onClick={() => router.push(`/recruit/${recruit.id}`)}
+      onClick={() => router.push(`/recruit/detail/?recruitId=${recruit.id}`)}
       className={styles.listItem}
     >
       <ListItemText
diff --git a/pages/recruit/[id]/index.tsx b/pages/recruit/detail.tsx
similarity index 95%
rename from pages/recruit/[id]/index.tsx
rename to pages/recruit/detail.tsx
index 35c73b520..37c94d187 100644
--- a/pages/recruit/[id]/index.tsx
+++ b/pages/recruit/detail.tsx
@@ -9,7 +9,7 @@ import 'react-quill/dist/quill.bubble.css';
 
 function Recruit() {
   const router = useRouter();
-  const recruitId = parseInt(router.query.id as string);
+  const recruitId = parseInt(router.query.recruitId as string);
 
   const { data, isLoading } = useRecruitDetail(recruitId);
 

From 8f782cee402c488d744dc7ff57184b92a8254f33 Mon Sep 17 00:00:00 2001
From: yoouyeon <jyeon.yoon59@gmail.com>
Date: Fri, 12 Apr 2024 20:36:07 +0900
Subject: [PATCH 24/28] =?UTF-8?q?[Feat]=20=EC=A7=80=EC=9B=90=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20url=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/recruit/{[id] => }/apply.tsx | 2 +-
 pages/recruit/detail.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pages/recruit/{[id] => }/apply.tsx (95%)

diff --git a/pages/recruit/[id]/apply.tsx b/pages/recruit/apply.tsx
similarity index 95%
rename from pages/recruit/[id]/apply.tsx
rename to pages/recruit/apply.tsx
index b56d683ed..3f0887a39 100644
--- a/pages/recruit/[id]/apply.tsx
+++ b/pages/recruit/apply.tsx
@@ -9,7 +9,7 @@ import useRecruitDetail from 'hooks/recruit/useRecruitDetail';
 
 function Apply() {
   const router = useRouter();
-  const recruitId = parseInt(router.query.id as string);
+  const recruitId = parseInt(router.query.recruitId as string);
   const setAlertState = useSetRecoilState(applicationAlertState);
 
   const { data, isLoading } = useRecruitDetail(recruitId);
diff --git a/pages/recruit/detail.tsx b/pages/recruit/detail.tsx
index 37c94d187..653df01ce 100644
--- a/pages/recruit/detail.tsx
+++ b/pages/recruit/detail.tsx
@@ -14,7 +14,7 @@ function Recruit() {
   const { data, isLoading } = useRecruitDetail(recruitId);
 
   const onApply = () => {
-    router.push(`/recruit/${recruitId}/apply`);
+    router.push(`/recruit/apply?recruitId=${recruitId}`);
   };
 
   // TODO : 구체화 필요함.

From 05cdc0b876b5b082d7f9a7983f70564d318cc494 Mon Sep 17 00:00:00 2001
From: yoouyeon <jyeon.yoon59@gmail.com>
Date: Fri, 12 Apr 2024 20:44:08 +0900
Subject: [PATCH 25/28] =?UTF-8?q?[Feat]=20=EC=A7=80=EC=9B=90=EC=84=9C=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20url=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/recruit/Main/MyApplicationInfo.tsx | 2 +-
 components/recruit/Main/MyRecruitment.tsx     | 2 +-
 pages/recruit/{[id] => }/my-application.tsx   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename pages/recruit/{[id] => }/my-application.tsx (97%)

diff --git a/components/recruit/Main/MyApplicationInfo.tsx b/components/recruit/Main/MyApplicationInfo.tsx
index dc9b6440f..4d111741c 100644
--- a/components/recruit/Main/MyApplicationInfo.tsx
+++ b/components/recruit/Main/MyApplicationInfo.tsx
@@ -17,7 +17,7 @@ const MyApplicationInfo = ({
   const onCheck = () => {
     if (!applicationId) return;
     router.push(
-      `/recruit/${recruitId}/my-application?applicationId=${applicationId}`
+      `/recruit/my-application?recruitId=${recruitId}&applicationId=${applicationId}`
     );
   };
 
diff --git a/components/recruit/Main/MyRecruitment.tsx b/components/recruit/Main/MyRecruitment.tsx
index 99c0b4b5c..c914f32fd 100644
--- a/components/recruit/Main/MyRecruitment.tsx
+++ b/components/recruit/Main/MyRecruitment.tsx
@@ -21,7 +21,7 @@ const MyRecruitment = ({ applicationId }: { applicationId?: number }) => {
         <CollapseListItem title={'지원서 정보'}>
           <MyApplicationInfo
             status={status}
-            recruitId={router.query.id as string}
+            recruitId={router.query.recruitId as string}
             applicationId={applicationId}
           />
         </CollapseListItem>
diff --git a/pages/recruit/[id]/my-application.tsx b/pages/recruit/my-application.tsx
similarity index 97%
rename from pages/recruit/[id]/my-application.tsx
rename to pages/recruit/my-application.tsx
index f79a31892..b276e5d1a 100644
--- a/pages/recruit/[id]/my-application.tsx
+++ b/pages/recruit/my-application.tsx
@@ -12,7 +12,7 @@ import useRecruitDetailUser from 'hooks/recruit/useRecruitDetailUser';
 
 function MyApplication() {
   const router = useRouter();
-  const recruitId = parseInt(router.query.id as string);
+  const recruitId = parseInt(router.query.recruitId as string);
   const applicationId = parseInt(router.query.applicationId as string);
   const setAlertState = useSetRecoilState(applicationAlertState);
   const [mode, setMode] = useState<ApplicationFormType>('VIEW');

From e59067875fd02996b092b66194ac3fae0b030097 Mon Sep 17 00:00:00 2001
From: yoouyeon <jyeon.yoon59@gmail.com>
Date: Fri, 12 Apr 2024 20:46:43 +0900
Subject: [PATCH 26/28] =?UTF-8?q?[Feat]=20=EC=A7=80=EC=9B=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EC=B6=9C=20=EC=9D=B4=ED=9B=84=20=EC=9D=B4=EB=8F=99=20?=
 =?UTF-8?q?Url=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/modal/recruitment/ApplyEditModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/modal/recruitment/ApplyEditModal.tsx b/components/modal/recruitment/ApplyEditModal.tsx
index d6654d6e0..ea5f691e6 100644
--- a/components/modal/recruitment/ApplyEditModal.tsx
+++ b/components/modal/recruitment/ApplyEditModal.tsx
@@ -40,7 +40,7 @@ function ApplyEditModal(props: IApplyEditModalProps) {
           severity: mode === 'APPLY' ? 'success' : 'info',
         });
         resetModalState();
-        router.push(`/recruit/${recruitId}`);
+        router.push(`/recruit/detail?recruitId=${recruitId}`);
       },
       onError: () =>
         setAlertState({

From 107f4d020991754ed47c31dcb145bbeab1d5c98a Mon Sep 17 00:00:00 2001
From: yoouyeon <jyeon.yoon59@gmail.com>
Date: Fri, 12 Apr 2024 20:56:18 +0900
Subject: [PATCH 27/28] =?UTF-8?q?[Fix]=20=EC=BF=BC=EB=A6=AC=ED=8C=8C?=
 =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/recruit/Main/MyRecruitment.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/recruit/Main/MyRecruitment.tsx b/components/recruit/Main/MyRecruitment.tsx
index c914f32fd..ce1dd1e6c 100644
--- a/components/recruit/Main/MyRecruitment.tsx
+++ b/components/recruit/Main/MyRecruitment.tsx
@@ -10,7 +10,7 @@ import textStyle from 'styles/recruit/text.module.scss';
 const MyRecruitment = ({ applicationId }: { applicationId?: number }) => {
   const router = useRouter();
   const { data } = useGetRecruitResult(
-    router.query.id as string,
+    router.query.recruitId as string,
     applicationId
   );
   const { status, interviewDate } = data || {}; // TODO : 에러가 난 경우 적절한 처리 필요함.

From 816cf1c3d8dfa2f82c45f3407710575df7cd49d8 Mon Sep 17 00:00:00 2001
From: hyobb109 <hyobb109@gmail.com>
Date: Mon, 15 Apr 2024 14:01:28 +0900
Subject: [PATCH 28/28] =?UTF-8?q?[Chore]=20=EC=A3=BC=EC=84=9D=20=EB=90=98?=
 =?UTF-8?q?=EB=8F=8C=EB=A6=AC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailRecruitUserList.tsx                 | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx b/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
index 4e4c5a095..bbfbe122d 100644
--- a/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
+++ b/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
@@ -26,28 +26,28 @@ const tableTitle: { [key: string]: string } = {
 };
 
 function DetailRecruitUserList({ recruitId }: { recruitId: number }) {
-  // // const [currentPage, setCurrentPage] = useState<number>(1);
-  // const { recruitUserData, questions } = useRecruitmentUserFilter(
-  //   recruitId
-  //   // currentPage
-  // );
+  // const [currentPage, setCurrentPage] = useState<number>(1);
+  const { recruitUserData, questions } = useRecruitmentUserFilter(
+    recruitId
+    // currentPage
+  );
 
-  // if (!recruitUserData.applicationResults?.length) {
-  //   return (
-  //     <TableContainer className={styles.tableContainer} component={Paper}>
-  //       <Table className={styles.table} aria-label='customized table'>
-  //         <AdminTableHead tableName={'recruitUserList'} table={tableTitle} />
-  //         <TableBody className={styles.tableBody}>
-  //           <AdminEmptyItem content={'공고 지원자 내역이 비어있습니다'} />
-  //         </TableBody>
-  //       </Table>
-  //     </TableContainer>
-  //   );
-  // }
+  if (!recruitUserData.applicationResults?.length) {
+    return (
+      <TableContainer className={styles.tableContainer} component={Paper}>
+        <Table className={styles.table} aria-label='customized table'>
+          <AdminTableHead tableName={'recruitUserList'} table={tableTitle} />
+          <TableBody className={styles.tableBody}>
+            <AdminEmptyItem content={'공고 지원자 내역이 비어있습니다'} />
+          </TableBody>
+        </Table>
+      </TableContainer>
+    );
+  }
 
   return (
     <>
-      {/* {FilterQptionsUI(recruitUserData.applicationResults, recruitId)}
+      {FilterQptionsUI(recruitUserData.applicationResults, recruitId)}
       <TableContainer className={styles.tableContainer} component={Paper}>
         <Table className={styles.table} aria-label='customized table'>
           <TableHead className={styles.tableHeader}>
@@ -68,7 +68,7 @@ function DetailRecruitUserList({ recruitId }: { recruitId: number }) {
             )}
           </TableBody>
         </Table>
-      </TableContainer> */}
+      </TableContainer>
       <div className={styles.pageNationContainer}>
         {/* <PageNation
           curPage={recruitUserData.currentPage}