diff --git a/src/components/ServiceManage/index.js b/src/components/ServiceManage/index.js
index 6bfe6e4..f33d458 100644
--- a/src/components/ServiceManage/index.js
+++ b/src/components/ServiceManage/index.js
@@ -17,6 +17,10 @@ import MailListSearchBar from './searchBar/MailListSearchBar';
import LandInfoSearchBar from './searchBar/LandInfoSearchBar';
import BusinessLogSearchBar from './searchBar/BusinessLogSearchBar';
import DataInitSearchBar from './searchBar/DataInitSearchBar';
+import LogViewSearchBar from './searchBar/LogViewSearchBar';
+import AdminViewSearchBar from './searchBar/AdminViewSearchBar';
+import CaliumRequestSearchBar from './searchBar/CaliumRequestSearchBar';
+
//etc
import ReportListSummary from './ReportListSummary';
import WhiteListSearchBar from './WhiteListRegistBar';
@@ -29,6 +33,9 @@ export {
LandInfoSearchBar,
BusinessLogSearchBar,
DataInitSearchBar,
+ LogViewSearchBar,
+ AdminViewSearchBar,
+ CaliumRequestSearchBar,
ReportListAnswerModal,
ReportListDetailModal,
ReportListSearchBar,
diff --git a/src/components/UserManage/AdminViewSearchBar.js b/src/components/ServiceManage/searchBar/AdminViewSearchBar.js
similarity index 93%
rename from src/components/UserManage/AdminViewSearchBar.js
rename to src/components/ServiceManage/searchBar/AdminViewSearchBar.js
index 9ce9e25..4c16a9a 100644
--- a/src/components/UserManage/AdminViewSearchBar.js
+++ b/src/components/ServiceManage/searchBar/AdminViewSearchBar.js
@@ -1,9 +1,9 @@
import { styled } from 'styled-components';
-import { TextInput, BtnWrapper, InputLabel, SelectInput } from '../../styles/Components';
-import Button from '../common/button/Button';
-import CheckBox from '../common/input/CheckBox';
-import { SearchBarLayout } from '../common/SearchBar';
+import { TextInput, BtnWrapper, InputLabel, SelectInput } from '../../../styles/Components';
+import Button from '../../common/button/Button';
+import CheckBox from '../../common/input/CheckBox';
+import { SearchBarLayout } from '../../common/SearchBar';
import { useState } from 'react';
const AdminViewSearchBar = ({ handleSearch, groupList, setResultData, setCurrentPage }) => {
diff --git a/src/components/ServiceManage/searchBar/BattleEventSearchBar.js b/src/components/ServiceManage/searchBar/BattleEventSearchBar.js
index bcd150b..f1b3c33 100644
--- a/src/components/ServiceManage/searchBar/BattleEventSearchBar.js
+++ b/src/components/ServiceManage/searchBar/BattleEventSearchBar.js
@@ -230,15 +230,8 @@ const BattleEventSearchBar = ({ searchParams, onSearch, onReset, configData, rew
handleEndDate={date => onSearch({ endDate: date }, false)}
/>
>,
- <>>,<>>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default BattleEventSearchBar;
\ No newline at end of file
diff --git a/src/components/ServiceManage/searchBar/BusinessLogSearchBar.js b/src/components/ServiceManage/searchBar/BusinessLogSearchBar.js
index 7523e82..24c5d01 100644
--- a/src/components/ServiceManage/searchBar/BusinessLogSearchBar.js
+++ b/src/components/ServiceManage/searchBar/BusinessLogSearchBar.js
@@ -197,15 +197,8 @@ const BusinessLogSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ end_dt: date }, false)}
/>
>,
- <>>,<>>,<>>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default BusinessLogSearchBar;
\ No newline at end of file
diff --git a/src/components/ServiceManage/searchBar/CaliumRequestSearchBar.js b/src/components/ServiceManage/searchBar/CaliumRequestSearchBar.js
index d2c17b9..6a29087 100644
--- a/src/components/ServiceManage/searchBar/CaliumRequestSearchBar.js
+++ b/src/components/ServiceManage/searchBar/CaliumRequestSearchBar.js
@@ -72,15 +72,9 @@ const CaliumRequestSearchBar = ({ handleSearch, setResultData }) => {
))}
>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default CaliumRequestSearchBar;
\ No newline at end of file
diff --git a/src/components/ServiceManage/searchBar/DataInitSearchBar.js b/src/components/ServiceManage/searchBar/DataInitSearchBar.js
index 46869d8..6ff6f46 100644
--- a/src/components/ServiceManage/searchBar/DataInitSearchBar.js
+++ b/src/components/ServiceManage/searchBar/DataInitSearchBar.js
@@ -117,16 +117,9 @@ const DataInitSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ end_dt: date }, false)}
/>
>,
- <>>,<>>,<>>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default DataInitSearchBar;
\ No newline at end of file
diff --git a/src/components/ServiceManage/searchBar/EventListSearchBar.js b/src/components/ServiceManage/searchBar/EventListSearchBar.js
index 0815f13..bf2d3dc 100644
--- a/src/components/ServiceManage/searchBar/EventListSearchBar.js
+++ b/src/components/ServiceManage/searchBar/EventListSearchBar.js
@@ -89,15 +89,8 @@ const EventListSearchBar = ({ handleSearch, setResultData }) => {
))}
>,
- <>>,<>>,<>>,<>>,<>>,<>>,<>>,<>>,<>>,<>>,<>>,<>>,<>>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default EventListSearchBar;
\ No newline at end of file
diff --git a/src/components/ServiceManage/searchBar/ItemsSearchBar.js b/src/components/ServiceManage/searchBar/ItemsSearchBar.js
index 3ff729d..385ea82 100644
--- a/src/components/ServiceManage/searchBar/ItemsSearchBar.js
+++ b/src/components/ServiceManage/searchBar/ItemsSearchBar.js
@@ -114,14 +114,8 @@ const ItemsSearchBar = ({ handleSearch, setResultData }) => {
maxDate={new Date()}
/>
>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default ItemsSearchBar;
diff --git a/src/components/ServiceManage/searchBar/LandAuctionSearchBar.js b/src/components/ServiceManage/searchBar/LandAuctionSearchBar.js
index edf8ab6..8d83eb4 100644
--- a/src/components/ServiceManage/searchBar/LandAuctionSearchBar.js
+++ b/src/components/ServiceManage/searchBar/LandAuctionSearchBar.js
@@ -191,15 +191,8 @@ const LandAuctionSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ auctionEndDate: date }, false)}
/>
>,
- <>>,<>>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default LandAuctionSearchBar;
\ No newline at end of file
diff --git a/src/components/ServiceManage/searchBar/LandInfoSearchBar.js b/src/components/ServiceManage/searchBar/LandInfoSearchBar.js
index 2149512..0a66c12 100644
--- a/src/components/ServiceManage/searchBar/LandInfoSearchBar.js
+++ b/src/components/ServiceManage/searchBar/LandInfoSearchBar.js
@@ -187,15 +187,8 @@ const LandInfoSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ endDate: date }, false)}
/>
>,
- <>>,<>>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default LandInfoSearchBar;
\ No newline at end of file
diff --git a/src/components/UserManage/LogViewSearchBar.js b/src/components/ServiceManage/searchBar/LogViewSearchBar.js
similarity index 96%
rename from src/components/UserManage/LogViewSearchBar.js
rename to src/components/ServiceManage/searchBar/LogViewSearchBar.js
index f413d6a..f05659e 100644
--- a/src/components/UserManage/LogViewSearchBar.js
+++ b/src/components/ServiceManage/searchBar/LogViewSearchBar.js
@@ -1,9 +1,9 @@
import { styled } from 'styled-components';
import { useState } from 'react';
-import { TextInput, InputLabel, SelectInput, BtnWrapper } from '../../styles/Components';
-import Button from '../common/button/Button';
-import { SearchBarLayout, SearchPeriod } from '../common/SearchBar';
+import { TextInput, InputLabel, SelectInput, BtnWrapper } from '../../../styles/Components';
+import Button from '../../common/button/Button';
+import { SearchBarLayout, SearchPeriod } from '../../common/SearchBar';
const LogViewSearchBar = ({ handleSearch, resultData }) => {
const [searchData, setSearchData] = useState({
diff --git a/src/components/ServiceManage/searchBar/MailListSearchBar.js b/src/components/ServiceManage/searchBar/MailListSearchBar.js
index 168b4f4..3dbf0b4 100644
--- a/src/components/ServiceManage/searchBar/MailListSearchBar.js
+++ b/src/components/ServiceManage/searchBar/MailListSearchBar.js
@@ -130,14 +130,8 @@ const MailListSearchBar = ({ handleSearch, setResultData }) => {
))}
>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default MailListSearchBar;
\ No newline at end of file
diff --git a/src/components/ServiceManage/searchBar/ReportListSearchBar.js b/src/components/ServiceManage/searchBar/ReportListSearchBar.js
index dfd938f..414dead 100644
--- a/src/components/ServiceManage/searchBar/ReportListSearchBar.js
+++ b/src/components/ServiceManage/searchBar/ReportListSearchBar.js
@@ -123,14 +123,8 @@ const ReportListSearchBar = ({ handleSearch, setResultData }) => {
setSearchData({ ...searchData, searchKey: e.target.value })} />
>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default ReportListSearchBar;
diff --git a/src/components/ServiceManage/searchBar/UserBlockSearchBar.js b/src/components/ServiceManage/searchBar/UserBlockSearchBar.js
index b8b3b34..41ad0a4 100644
--- a/src/components/ServiceManage/searchBar/UserBlockSearchBar.js
+++ b/src/components/ServiceManage/searchBar/UserBlockSearchBar.js
@@ -104,14 +104,8 @@ const UserBlockSearchBar = ({ handleSearch, setResultData }) => {
))}
>,
- <>
-
-
-
-
- >,
];
- return ;
+ return ;
};
export default UserBlockSearchBar;
diff --git a/src/components/UserManage/CaliumRequestSearchBar.js b/src/components/UserManage/CaliumRequestSearchBar.js
deleted file mode 100644
index 1f80363..0000000
--- a/src/components/UserManage/CaliumRequestSearchBar.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { TextInput, BtnWrapper, InputLabel, SelectInput } from '../../styles/Components';
-import Button from '../common/button/Button';
-import { SearchBarLayout, SearchPeriod } from '../common/SearchBar';
-import { useState } from 'react';
-import { caliumStatus } from '../../assets/data/options';
-
-const CaliumRequestSearchBar = ({ handleSearch, setResultData }) => {
- const [searchData, setSearchData] = useState({
- content: '',
- status: 'ALL',
- startDate: '',
- endDate: '',
- });
-
- const handleSubmit = event => {
- event.preventDefault();
-
- handleSearch(
- searchData.content,
- searchData.status ? searchData.status : 'ALL',
- searchData.startDate ? searchData.startDate : '',
- searchData.endDate ? searchData.endDate : new Date(),
- (searchData.startDate && searchData.endDate === '') && setSearchData({ startDate : searchData.startDate ,endDate : new Date()}),
- );
-
- setResultData(searchData);
- };
-
- const handleReset = () => {
- setSearchData({
- content: '',
- status: 'ALL',
- startDate: '',
- endDate: '',
- order: 'DESC',
- });
-
- handleSearch('', 'ALL', '', '');
- setResultData('', 'ALL', '', '');
-
- window.location.reload();
- };
-
- const searchList = [
- <>
- 등록 일자
- {
- setSearchData({ ...searchData, startDate: data });
- }}
- endDate={searchData.endDate}
- handleEndDate={data => setSearchData({ ...searchData, endDate: data })}
- />
- >,
- <>
- 요청 내용
- setSearchData({ ...searchData, content: e.target.value })}
- />
- >,
- <>
- 요청 상태
- setSearchData({ ...searchData, status: e.target.value })}>
- {caliumStatus.map((data, index) => (
-
- ))}
-
- >,
- <>
-
-
-
-
- >,
- ];
-
- return ;
-};
-
-export default CaliumRequestSearchBar;
\ No newline at end of file
diff --git a/src/components/UserManage/index.js b/src/components/UserManage/index.js
index 4480458..0262251 100644
--- a/src/components/UserManage/index.js
+++ b/src/components/UserManage/index.js
@@ -1,17 +1,11 @@
-import CaliumRequestSearchBar from './CaliumRequestSearchBar';
import CaliumRequestRegistModal from './CaliumRequestRegistModal'
-import AdminViewSearchBar from './AdminViewSearchBar'
import AuthRegistBar from './AuthRegistBar'
import LogViewModal from './LogViewModal'
-import LogViewSearchBar from './LogViewSearchBar'
import AuthGroupRows from './AuthGroupRows'
export {
- CaliumRequestSearchBar,
CaliumRequestRegistModal,
- AdminViewSearchBar,
AuthRegistBar,
- LogViewSearchBar,
LogViewModal,
AuthGroupRows
}
\ No newline at end of file
diff --git a/src/components/common/SearchBar/SearchBarLayout.js b/src/components/common/SearchBar/SearchBarLayout.js
index 205d702..808bc20 100644
--- a/src/components/common/SearchBar/SearchBarLayout.js
+++ b/src/components/common/SearchBar/SearchBarLayout.js
@@ -1,7 +1,8 @@
import { styled } from 'styled-components';
-import { TextInput, SelectInput, SearchBarAlert } from '../../../styles/Components';
+import { TextInput, SelectInput, SearchBarAlert, BtnWrapper } from '../../../styles/Components';
+import Button from '../button/Button';
-const SearchBarLayout = ({ firstColumnData, secondColumnData, direction }) => {
+const SearchBarLayout = ({ firstColumnData, secondColumnData, direction, onReset, handleSubmit }) => {
return (
@@ -16,6 +17,12 @@ const SearchBarLayout = ({ firstColumnData, secondColumnData, direction }) => {
))}
)}
+
+
+
+
+
+
);
};
@@ -23,16 +30,16 @@ const SearchBarLayout = ({ firstColumnData, secondColumnData, direction }) => {
export default SearchBarLayout;
const SearchbarStyle = styled.div`
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- font-size: 14px;
- padding: 20px;
- border-top: 1px solid #000;
- border-bottom: 1px solid #000;
- margin: 0 0 40px;
- flex-flow: ${props => props.direction};
- gap: ${props => (props.direction === 'column' ? '20px' : '20px 0')};
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ font-size: 14px;
+ padding: 20px;
+ border-radius: 8px;
+ border: 1px solid #ddd;
+ margin: 0 0 40px;
+ flex-flow: ${props => props.direction};
+ gap: ${props => (props.direction === 'column' ? '20px' : '20px 0')};
`;
const SearchItem = styled.div`
@@ -54,4 +61,10 @@ const SearchRow = styled.div`
display: flex;
flex-wrap: wrap;
gap: 20px 0;
+
+ &:last-child {
+ border-top: 1px solid #e0e0e0;
+ padding-top: 15px;
+ margin-top: 15px;
+ }
`;
diff --git a/src/pages/UserManage/AdminView.js b/src/pages/UserManage/AdminView.js
index 67cd3e7..acd7ab1 100644
--- a/src/pages/UserManage/AdminView.js
+++ b/src/pages/UserManage/AdminView.js
@@ -7,7 +7,7 @@ import Pagination from '../../components/common/Pagination/Pagination';
import Modal from '../../components/common/modal/Modal';
import { AdminViewList, AdminViewGroupList, AdminLoginApprove, AdminDeleteUser, AdminChangeGroup, AdminChangePw } from '../../apis/Admin';
-import AdminViewSearchBar from '../../components/UserManage/AdminViewSearchBar';
+import {AdminViewSearchBar} from '../../components/ServiceManage';
import { useNavigate } from 'react-router-dom';
import { authList } from '../../store/authList';
diff --git a/src/pages/UserManage/CaliumRequest.js b/src/pages/UserManage/CaliumRequest.js
index 5dcff5d..837e2b1 100644
--- a/src/pages/UserManage/CaliumRequest.js
+++ b/src/pages/UserManage/CaliumRequest.js
@@ -19,10 +19,11 @@ import {
} from '../../styles/ModuleComponents';
import {Button, ExcelDownButton, Pagination, DynamicModal, ViewTableInfo, Loading} from '../../components/common';
import { convertKTC, truncateText } from '../../utils';
-import { CaliumRequestRegistModal, CaliumRequestSearchBar } from '../../components/UserManage';
+import { CaliumRequestRegistModal } from '../../components/UserManage';
import { CaliumCharge, CaliumRequestView } from '../../apis';
import { withAuth } from '../../hooks/hook';
import { convertEndDateToISO, convertStartDateToISO } from '../../utils/date';
+import {CaliumRequestSearchBar} from '../../components/ServiceManage';
const CaliumRequest = () => {
const token = sessionStorage.getItem('token');
diff --git a/src/pages/UserManage/LogView.js b/src/pages/UserManage/LogView.js
index 9f52ea7..4d71d9c 100644
--- a/src/pages/UserManage/LogView.js
+++ b/src/pages/UserManage/LogView.js
@@ -1,6 +1,6 @@
import { Fragment, useState, useEffect } from 'react';
-import LogViewSearchBar from '../../components/UserManage/LogViewSearchBar';
+import {LogViewSearchBar} from '../../components/ServiceManage';
import { Title, FormWrapper, SelectInput, TableInfo, ListCount, ListOption, TableStyle, BtnWrapper, ButtonClose, ModalText } from '../../styles/Components';
import Button from '../../components/common/button/Button';
import Pagination from '../../components/common/Pagination/Pagination';