diff --git a/src/App.js b/src/App.js index e0aaacf..d528c49 100644 --- a/src/App.js +++ b/src/App.js @@ -37,17 +37,17 @@ function App() { } /> } /> } /> - } /> + } /> } /> } /> } /> } /> } /> - } /> - } /> - } /> + } /> + } /> + } /> } /> - } /> + } /> } /> } /> diff --git a/src/components/toggle/Toggle.js b/src/components/toggle/Toggle.js index 3d6bdd9..50e565b 100644 --- a/src/components/toggle/Toggle.js +++ b/src/components/toggle/Toggle.js @@ -33,7 +33,7 @@ const Circle = styled.div` `; export function Toggle(props) { - const [toggle, setToggle] = useState(false); + const [toggle, setToggle] = useState(props.isEnable); const clickedToggle = () => { setToggle((prev) => !prev); props.click(!toggle); diff --git a/src/constants/Path.js b/src/constants/Path.js index 2e63591..759a4f7 100644 --- a/src/constants/Path.js +++ b/src/constants/Path.js @@ -31,9 +31,9 @@ export const MAIN_MENUS = [ export const ADMIN_MENUS = [ { name: '직원 관리', path: '/manage/users' }, { name: '회의실 관리', path: '/manage/offices' }, - { name: '자원 관리', path: '/manage/resources' }, + { name: '장비 관리', path: '/manage/resources' }, { name: '회의실예약 관리', path: '/manage/officeBooking' }, - { name: '자원 예약 관리', path: '/manage/resourceBooking' }, + { name: '장비 예약 관리', path: '/manage/resourceBooking' }, { name: '차량 예약 관리', path: '/manage/carBooking' } ] @@ -50,7 +50,7 @@ export const BookingCategoryPathList = [ export function getBookingCategoryPath(koreanName) { if (koreanName === '회의실') { return BookingCategoryPathList[0] - } else if (koreanName === '자원') { + } else if (koreanName === '장비') { return BookingCategoryPathList[1] } } \ No newline at end of file diff --git a/src/pages/manager/resourceManage/ResourceManage.js b/src/pages/manager/resourceManage/ResourceManage.js index e4404db..c2dd3f5 100644 --- a/src/pages/manager/resourceManage/ResourceManage.js +++ b/src/pages/manager/resourceManage/ResourceManage.js @@ -41,7 +41,7 @@ function ResourceManage(props) { return ( {props.title} - + @@ -50,26 +50,26 @@ function ResourceManage(props) { 장비명 보관장소 - 책임자 - 설명 + 책임자 + 설명 { resources.length === 0 ? - 자원 내역이 없습니다. + 장비 내역이 없습니다. : resources.map((resource) => )} diff --git a/src/pages/manager/resourceManage/ResourceManageTableCell.js b/src/pages/manager/resourceManage/ResourceManageTableCell.js index 677ab57..8e93029 100644 --- a/src/pages/manager/resourceManage/ResourceManageTableCell.js +++ b/src/pages/manager/resourceManage/ResourceManageTableCell.js @@ -14,8 +14,8 @@ function ResourceManageTableCell(props) { {props.name} {props.location} - {props.user}({props.userPhone}) - {props.description} + {props.user}({props.userPhone}) + {props.description} )