Skip to content

Commit 2ae5b76

Browse files
committed
Merge branch 'develop'
2 parents 182031f + 8039310 commit 2ae5b76

File tree

5 files changed

+37
-26
lines changed

5 files changed

+37
-26
lines changed

src/apis/volunteers/index.ts

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,30 @@
1-
import { instance } from "../axios";
2-
import { getMyVolunteersResponse, getVolunteerResponse } from "./response";
1+
import { instance } from '../axios';
2+
import { getMyVolunteersResponse, getVolunteerResponse } from './response';
33

44
const router = '/volunteers';
55

66
// 봉사 활동 신청
77
export const applicationVolunteer = async (volunteerId: string) => {
8-
const url = `${router}/application/${volunteerId}`;
9-
console.log(`Requesting POST: ${url}`);
10-
await instance.post(url);
11-
}
8+
const url = `${router}/application/${volunteerId}`;
9+
await instance.post(url);
10+
};
1211

1312
// 봉사 활동 신청 취소
1413
export const deleteApplicationVolunteer = async (volunteerId: string) => {
15-
const url = `${router}/cancellation/${volunteerId}`;
16-
console.log(`Requesting DELETE: ${url}`);
17-
await instance.delete(url)
18-
}
14+
const url = `${router}/cancellation/${volunteerId}`;
15+
await instance.delete(url);
16+
};
1917

2018
// 봉사 활동 조회
2119
export const getVolunteer = async () => {
22-
const url = `${router}`;
23-
console.log(`Requesting GET: ${url}`);
24-
const {data} = await instance.get<getVolunteerResponse>(url);
25-
return data;
26-
}
20+
const url = `${router}`;
21+
const { data } = await instance.get<getVolunteerResponse>(url);
22+
return data;
23+
};
2724

2825
// 내 봉사 신청 내역 조회
2926
export const getMyVolunteers = async () => {
30-
const url = `${router}/my/application`;
31-
console.log(`Requesting GET: ${url}`);
32-
const {data} = await instance.get<getMyVolunteersResponse>(url)
33-
return data;
34-
}
27+
const url = `${router}/my/application`;
28+
const { data } = await instance.get<getMyVolunteersResponse>(url);
29+
return data;
30+
};

src/hooks/useVolunteerApi.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@ import {
55
getVolunteer,
66
getMyVolunteers,
77
} from '../apis/volunteers';
8+
import {
9+
getMyVolunteersResponse,
10+
getVolunteerResponse,
11+
} from '../apis/volunteers/response';
12+
import { AxiosError } from 'axios';
813

914
export const useGetVolunteer = () => {
10-
return useQuery({
15+
return useQuery<getVolunteerResponse, AxiosError>({
1116
queryKey: ['volunteer'],
1217
queryFn: getVolunteer,
1318
});
1419
};
1520

1621
export const useGetMyVolunteers = () => {
17-
return useQuery({
22+
return useQuery<getMyVolunteersResponse, AxiosError>({
1823
queryKey: ['my-volunteers'],
1924
queryFn: getMyVolunteers,
2025
});

src/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import App from './App';
44
import reportWebVitals from './reportWebVitals';
55
import { registerSetAuthToken } from './utils/setAuthToken';
66

7-
console.log('process.env.REACT_APP_BASE_URL:', process.env.REACT_APP_BASE_URL);
8-
97
registerSetAuthToken();
108

119
const root = ReactDOM.createRoot(

src/pages/Volunteer/Application.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ export const VolunteerApplication = () => {
2424
useEffect(() => {
2525
if (isLoading) return;
2626
if (isError) {
27-
console.error('봉사 데이터 불러오기 실패함, ', error);
27+
console.error(
28+
'봉사 데이터 불러오기 실패함, ',
29+
'Status:',
30+
error.response?.status,
31+
'Message:',
32+
error.response?.data,
33+
);
2834
return;
2935
}
3036
if (data) {

src/pages/Volunteer/History.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ export const VolunteerHistory = () => {
2424
useEffect(() => {
2525
if (isLoading) return;
2626
if (isError) {
27-
console.error('봉사 데이터 불러오기 실패함, ', error);
27+
console.error(
28+
'봉사 데이터 불러오기 실패함, ',
29+
'Status:',
30+
error.response?.status,
31+
'Message:',
32+
error.response?.data,
33+
);
2834
return;
2935
}
3036
if (data) {

0 commit comments

Comments
 (0)