Skip to content

Commit 0aa5956

Browse files
authored
Merge pull request #357 from devpalsPlus/feat/#355
모집 공고 생성 페이지 일부 수정( feat/#355 )
2 parents 2532a98 + 9104815 commit 0aa5956

File tree

40 files changed

+249
-415
lines changed

40 files changed

+249
-415
lines changed

src/api/admin/customerService/inquiry.api.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ export const getAllInquiries = async (
2121
}
2222
};
2323

24+
export const getInquiriesPreview = async () => {
25+
try {
26+
const response = await httpClient.get<ApiAdminInquiry>(`/inquiry/preview`);
27+
return response.data.data;
28+
} catch (e) {
29+
console.error('문의 미리보기 조회 에러', e);
30+
throw e;
31+
}
32+
};
33+
2434
export const getInquiryDetail = async (id: string) => {
2535
try {
2636
const response = await httpClient.get<ApiAdminInquiryDetail>(

src/api/admin/tag.api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { ApiCommonBasicType } from '../../models/apiCommon';
2-
import type { TagFormType } from '../../models/tags';
2+
33
import { httpClient } from '../http.api';
44

55
export const postSkillTag = async (formData: FormData) => {

src/api/http.api.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import axios, { AxiosRequestConfig } from 'axios';
22
import useAuthStore from '../store/authStore';
3-
import { postRefresh } from './auth.api';
43

54
export const BASE_URL = `${import.meta.env.VITE_APP_API_BASE_URL}`;
65
const DEFAULT_TIMEOUT = 15000;
76

87
export const createClient = (config?: AxiosRequestConfig) => {
9-
const { login, logout } = useAuthStore.getState();
8+
const { logout } = useAuthStore.getState();
109

1110
const axiosInstance = axios.create({
1211
baseURL: BASE_URL,

src/assets/chat.svg

Lines changed: 0 additions & 260 deletions
This file was deleted.

src/components/admin/adminInquiry/AdminInquiryList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { AdminInquiryChangeSearchParams } from '../../../models/inquiry';
88

99
export type SearchParamsInquiryKeyType = keyof AdminInquiryChangeSearchParams;
1010
export default function AdminInquiryList() {
11-
const [searchParams, setSearchParams] = useSearchParams();
11+
const [searchParams] = useSearchParams();
1212
const userId = searchParams.get('userId') || '';
1313
const startDate = searchParams.get('startDate') || '';
1414
const endDate = searchParams.get('endDate') || '';

src/components/admin/adminTags/AdminTagsBasic.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useAdminSkillTag } from '../../../hooks/admin/useAdminTag';
44
import { useLocation } from 'react-router-dom';
55
import AdminTagCRUD from './AdminTagCRUD';
66
import AdminSkillTagItems from './skills/AdminSkillTagItems';
7-
import type { TagFormType } from '../../../models/tags';
7+
88
import AdminPositionItems from './positions/AdminPositionItems';
99

1010
export type TWitchTag = 'skill' | 'position';

src/components/admin/adminUserReport/AdminReportDetail.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import * as S from './AdminReportDetail.styled';
32
import AdminTitle from '../../common/admin/title/AdminTitle';
43
import Avatar from '../../common/avatar/Avatar';

src/components/admin/mainCard/graphCard/GraphCard.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import * as S from './GraphCard.styled';
32
import { Line } from 'react-chartjs-2';
43
import 'chart.js/auto';
@@ -58,7 +57,6 @@ const options: ChartOptions<'line'> = {
5857
x: {
5958
grid: {
6059
display: true,
61-
borderDash: [5, 5],
6260
color: 'rgba(0,0,0,0.1)',
6361
},
6462
ticks: {
@@ -71,9 +69,6 @@ const options: ChartOptions<'line'> = {
7169
y: {
7270
grid: {
7371
display: true,
74-
drawBorder: false,
75-
76-
borderDash: [5, 5],
7772
color: 'rgba(0,0,0,0.1)',
7873
},
7974
ticks: {

src/components/admin/previewComponent/allUserPreview/AllUserPreview.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import * as S from './AllUserPreview.styled';
32
import Avatar from '../../../common/avatar/Avatar';
43
import { ADMIN_ROUTE } from '../../../../constants/routes';

src/components/admin/previewComponent/inquiresPreview/InquiresPreview.tsx

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
import * as S from './InquiresPreview.styled';
2-
import { useGetAllInquiries } from '../../../../hooks/admin/useGetAllInquiries';
32
import Avatar from '../../../common/avatar/Avatar';
43
import { ADMIN_ROUTE } from '../../../../constants/routes';
54
import arrow_right from '../../../../assets/ArrowRight.svg';
65
import Spinner from '../../../user/mypage/Spinner';
7-
import { AdminInquiryChangeSearchParams } from '../../../../models/inquiry';
6+
import { useGetInquiriesPreview } from '../../../../hooks/admin/useGetInquiriesPreview';
87

98
const InquiresPreview = () => {
10-
const childSearchParams: AdminInquiryChangeSearchParams = {
11-
userId: '',
12-
startDate: '',
13-
endDate: '',
14-
};
15-
const { allInquiriesData, isLoading, isFetching } =
16-
useGetAllInquiries(childSearchParams);
9+
const { allInquiriesPreviewData, isLoading, isFetching } =
10+
useGetInquiriesPreview();
1711

1812
if (isLoading || isFetching) {
1913
return (
@@ -23,13 +17,13 @@ const InquiresPreview = () => {
2317
);
2418
}
2519

26-
if (!allInquiriesData || allInquiriesData.length === 0) {
20+
if (!allInquiriesPreviewData || allInquiriesPreviewData.length === 0) {
2721
return <S.Container>등록된 문의가 없습니다.</S.Container>;
2822
}
2923

3024
return (
3125
<S.Container>
32-
{allInquiriesData?.map((inquiry) => (
26+
{allInquiriesPreviewData.map((inquiry) => (
3327
<S.Wrapper key={inquiry.id}>
3428
<S.Content>
3529
{/* <Link to={`${ADMIN_ROUTE.}`} */}

0 commit comments

Comments
 (0)