diff --git a/src/api/bug/index.ts b/src/api/bug/index.ts index a3a6eba..c03e687 100644 --- a/src/api/bug/index.ts +++ b/src/api/bug/index.ts @@ -16,6 +16,7 @@ export const BugPost = () => { await instance.post(`/bug/message`, { title: param.title, content: param.content, + model: "WEB", file_name: param.file_name, }); } catch (error) { diff --git a/src/api/index.ts b/src/api/index.ts index 9bd3841..1eca8c3 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -37,40 +37,30 @@ refreshInstance.interceptors.request.use( instance.interceptors.response.use( (response) => response, - async (error: AxiosError) => { + async (error: AxiosError) => { if (axios.isAxiosError(error) && error.response) { - const { status } = error.response.data; + const { status } = error.response; if (status === 401) { const refreshToken = cookie.get("refresh_token"); if (refreshToken) { try { - const res = await axios.put( - `${BASEURL}/refresh`, - {}, - { + await axios + .put(`${BASEURL}/admin/refresh`, null, { headers: { - "X-Refresh-Token": `Bearer ${refreshToken}`, + "X-Refresh-Token": `${refreshToken}`, }, - } - ); - const { data } = res.data; - const accessToken = data.accessToken; - cookie.set("access_token", accessToken); - if (error.config) { - error.config.headers.Authorization = `Bearer ${accessToken}`; - return axios.request(error.config); - } - } catch { - throw error; + }) + .then((response) => { + const data = response.data; + cookie.set("access_token", data.access_token); + cookie.set("refresh_token", data.refresh_token); + }); + } catch (refreshError) { + return Promise.reject(refreshError); } - } else { - throw error; } - } else { - throw error; } - } else { - throw error; } + return Promise.reject(error); } ); diff --git a/src/components/dropdown/status.tsx b/src/components/dropdown/status.tsx index 130da5d..97fe8ca 100644 --- a/src/components/dropdown/status.tsx +++ b/src/components/dropdown/status.tsx @@ -41,7 +41,10 @@ const AfterCheck: React.FC = ({ state, onChange, type }) => { case "외출": return "border border-primary-500 text-primary-500"; case "이동": - return "border border border-tertiary-300 text-tertiary-300"; + return "border border-tertiary-300 text-tertiary-300"; + case "취업": + case "현체": + return "border border-neutral-500 text-neutral-500"; default: return ""; } @@ -75,9 +78,9 @@ const AfterCheck: React.FC = ({ state, onChange, type }) => { setIsDropdownVisible(false); }; - return state === "현체" ? ( + return state === "현체" || state === "취업" ? (
{selectedOption}
diff --git a/src/components/main/checkPage.tsx b/src/components/main/checkPage.tsx index 1334a2b..36704a4 100644 --- a/src/components/main/checkPage.tsx +++ b/src/components/main/checkPage.tsx @@ -32,7 +32,7 @@ const CheckPage = ({ type }: checkPageType) => { {type === "outGoing" ? (
- 현재 외출 중인 학생은 총 + 현재 외출/조기귀가 중인 학생은 총 {list.out}명입니다.