Skip to content
Merged
23 changes: 13 additions & 10 deletions src/components/admin/visitor/VisitorList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ function VisitorList({ content }: GetVisitorsData) {
<p>차량번호</p>
<p>주차시간</p>
</li>
{content &&
{content.length ? (
content.map((item) => {
return (
<li key={item.visitorId}>
<input type="checkbox" />
<p>
{item.startDateTime &&
dayjs(item.startDateTime).format('YYYY-MM-DD hh:mm')}
dayjs(item.startDateTime).format('YYYY-MM-DD HH:mm')}
</p>
<p>
{item.visitTime &&
dayjs(item.visitTime).format('YYYY-MM-DD h:m')}
dayjs(item.visitTime).format('YYYY-MM-DD HH:m')}
</p>
<p>
{item.company}
Expand All @@ -38,18 +38,21 @@ function VisitorList({ content }: GetVisitorsData) {
<p>{item.visitorName}</p>
<p>{item.officeName}</p>
<p>
{item.inTime && dayjs(item.inTime).format('YYYY-MM-DD h:m')}
{item.inTime && dayjs(item.inTime).format('YYYY-MM-DD HH:m')}
<br />
{item.outTime && dayjs(item.outTime).format('YYYY-MM-DD h:m')}
{item.outTime &&
dayjs(item.outTime).format('YYYY-MM-DD HH:m')}
</p>
<p>{item.carNumber}</p>
<p>
{item.stayTime &&
dayjs(item.stayTime).format('YYYY-MM-DD h:m')}
</p>
{item.stayTime ? <p>{item.stayTime}분</p> : <p />}
</li>
);
})}
})
) : (
<li>
<p>데이터 없음</p>
</li>
)}
</ul>
</div>
);
Expand Down
3 changes: 2 additions & 1 deletion src/components/admin/visitor/VisitorSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { VisitorSearchProps } from '@/types/visitor/visitor';
import { css } from '@emotion/react';
import { ChangeEvent, useState } from 'react';

function VisitorSearch({ setVisitorList }: VisitorSearchProps) {
function VisitorSearch({ setVisitorList, setPage }: VisitorSearchProps) {
const [select, setSelect] = useState('COMPANY');
const [searchText, setSearchText] = useState('');
const [startDate, setStartDate] = useState('');
Expand Down Expand Up @@ -45,6 +45,7 @@ function VisitorSearch({ setVisitorList }: VisitorSearchProps) {
const response = await getSearchVisitors(queryString);
if (response?.data) {
setVisitorList(response.data);
setPage(1);
}
} catch (err) {
// 검색 오류 예외 처리
Expand Down
9 changes: 2 additions & 7 deletions src/components/admin/visitor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { css } from '@emotion/react';
import { useEffect, useState } from 'react';
import { GetVisitorsData } from '@/types/visitor/api';
import dayjs from 'dayjs';
import testList from './testList';
import VisitorListPagenation from './VisitorListPagenation';

function Index() {
Expand All @@ -25,11 +24,7 @@ function Index() {
}
};
visitorsData();
}, []);

useEffect(() => {
setVisitorList(testList);
}, [setVisitorList]);
}, [nowYear]);

const [page, setPage] = useState(1);
const limit = 5; // posts가 보일 최대한의 갯수
Expand All @@ -42,7 +37,7 @@ function Index() {

return (
<div css={contentStyles}>
<VisitorSearch setVisitorList={setVisitorList} />
<VisitorSearch setVisitorList={setVisitorList} setPage={setPage} />

{visitorList && (
<>
Expand Down
148 changes: 0 additions & 148 deletions src/components/admin/visitor/testList.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/types/visitor/visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ export interface VisitorListPagenationProps {

export interface VisitorSearchProps {
setVisitorList: Dispatch<SetStateAction<GetVisitorsData | undefined>>;
setPage: Dispatch<SetStateAction<number>>;
}