diff --git a/src/components/searchBar/ManageSearchBar.js b/src/components/searchBar/ManageSearchBar.js
index b2d4f03..c62da83 100644
--- a/src/components/searchBar/ManageSearchBar.js
+++ b/src/components/searchBar/ManageSearchBar.js
@@ -15,7 +15,7 @@ const Container = styled.div`
`
const ManageSearchContainer = styled.div`
- width: 85%;
+ flex: 1;
height: 100%;
display: flex;
align-items: center;
@@ -33,7 +33,6 @@ const ManageSearchImage = styled.img`
const ManageSearchText = styled.input`
padding-left: 10px;
font-size: 18px;
- width: 100%;
height: 100%;
background: none;
border: none;
@@ -41,9 +40,8 @@ const ManageSearchText = styled.input`
`
export const ManageAddButton = styled.button`
- width: 160px;
height: 100%;
- padding: 10px;
+ padding: 10px 15px;
margin-left: 10px;
border: none;
border-radius: 8px;
@@ -52,20 +50,17 @@ export const ManageAddButton = styled.button`
align-items: center;
filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25));
cursor: pointer;
+ font-size: 17px;
+ color: white;
+ white-space: nowrap;
`
export const ManageAddButtonImage = styled.img`
width: 16px;
height: 16px;
border-radius: 12px;
- border: 1px dashed var(--gray-300, #D0D5DD);
- margin: 0 5px;
-`
-
-export const ManageAddButtonLabel = styled.text`
- margin: auto;
- color: white;
- font-size: 17px;
+ border: 1px dashed var(--gray-300, #FFF);
+ margin-right: 10px;
`
function ManageSearchBar(props) {
@@ -88,7 +83,7 @@ function ManageSearchBar(props) {
}
- {props.buttonTitle}
+ {props.buttonTitle}
);
diff --git a/src/pages/admin/officeBookings/OfficeBookingManage.js b/src/pages/admin/officeBookings/OfficeBookingManage.js
index 1857d45..f9a1119 100644
--- a/src/pages/admin/officeBookings/OfficeBookingManage.js
+++ b/src/pages/admin/officeBookings/OfficeBookingManage.js
@@ -9,14 +9,12 @@ import RangeImage from "../../../assets/images/RangeArrow.svg"
import { getToken } from "utils/IsLoginUtil";
import { basicError } from 'utils/ErrorHandlerUtil';
-
const RangeImg = styled.img`
width: 20px;
height: 20px;
margin-right: 20px;
`
-
function OfficeBookingManage(props) {
const [bookingOffices, SetBookingOffices] = useState([]);
@@ -35,7 +33,7 @@ function OfficeBookingManage(props) {
.catch((error) => {basicError(error)})
}
- const chnageRange = () => {
+ const changeSort = () => {
alert("Q")
}
@@ -53,10 +51,10 @@ function OfficeBookingManage(props) {
회의실명 |
위치 |
- 예약일시 |
- 요청자 |
+ 예약일시 |
+ 예약자 |
상태 |
- 설정 |
+ 설정 |
@@ -64,12 +62,12 @@ function OfficeBookingManage(props) {
)}
diff --git a/src/pages/admin/officeBookings/OfficeBookingManageCell.js b/src/pages/admin/officeBookings/OfficeBookingManageCell.js
index d0285cf..19d483f 100644
--- a/src/pages/admin/officeBookings/OfficeBookingManageCell.js
+++ b/src/pages/admin/officeBookings/OfficeBookingManageCell.js
@@ -64,15 +64,15 @@ function OfficeBookingManageCell(props) {
{props.name} |
{props.detailInfo} |
- {props.startDateTime} ~ {props.endDateTime} |
- {props.requester} ({props.position}) |
+ {props.startDateTime} ~ {props.endDateTime} |
+ {props.reservatorName} ({props.reservatorPhone}) |
{props.status}
|
-
+ |
{status === BOOKED ? usingButton : cancelButton}
|
diff --git a/src/pages/admin/resource/ResourceManageAdd.js b/src/pages/admin/resource/ResourceManageAdd.js
index a3e92d9..4511a85 100644
--- a/src/pages/admin/resource/ResourceManageAdd.js
+++ b/src/pages/admin/resource/ResourceManageAdd.js
@@ -1,12 +1,12 @@
-import React,{ useState, useEffect, useRef } from "react";
+import React, {useEffect, useRef, useState} from "react";
import styled from "styled-components";
-import { RightContainer, TitleText, WhiteContainer } from "components/rightContainer/RightContainer";
-import { Bar } from "../../basic/myBookings/BookedList";
-import { ManageAddButton, ManageAddButtonImage, ManageAddButtonLabel } from "components/searchBar/ManageSearchBar";
+import {RightContainer, TitleText, WhiteContainer} from "components/rightContainer/RightContainer";
+import {Bar} from "../../basic/myBookings/BookedList";
+import {ManageAddButton, ManageAddButtonImage} from "components/searchBar/ManageSearchBar";
-import { getToken } from "utils/IsLoginUtil";
-import { basicError } from "utils/ErrorHandlerUtil";
+import {getToken} from "utils/IsLoginUtil";
+import {basicError} from "utils/ErrorHandlerUtil";
import {AdminResourcesAxios, ImageUrlAxios, ResourcesAxios, UsersAxios} from "api/AxiosApi";
import AddImageImage from "../../../assets/images/AddImage.svg"
@@ -478,7 +478,7 @@ function ResourceManageAdd(props) {
- {resourceInfo === null ? "대여 장비 추가" : "대여 장비 수정"}
+ {resourceInfo === null ? "대여 장비 추가" : "대여 장비 수정"}
diff --git a/src/pages/admin/resourceBookings/ResourceBookingManage.js b/src/pages/admin/resourceBookings/ResourceBookingManage.js
index 77b6a7e..7a70dfa 100644
--- a/src/pages/admin/resourceBookings/ResourceBookingManage.js
+++ b/src/pages/admin/resourceBookings/ResourceBookingManage.js
@@ -41,24 +41,24 @@ function ResourceBookingManage(props) {
장비명 |
- 카테고리 |
- 예약일자 |
- 요청자 |
+ 보관장소 |
+ 예약일시 |
+ 예약자 |
상태 |
- 설정 |
+ 설정 |
{bookingResources.map((bookingResource, index) =>
-
)}
diff --git a/src/pages/admin/resourceBookings/ResourceBookingManageCell.js b/src/pages/admin/resourceBookings/ResourceBookingManageCell.js
index 9b18f04..b7789d3 100644
--- a/src/pages/admin/resourceBookings/ResourceBookingManageCell.js
+++ b/src/pages/admin/resourceBookings/ResourceBookingManageCell.js
@@ -97,8 +97,6 @@ function ResourceBookingManageCell(props) {
반납 | 상세보기
)
-
-
var bookingButton = (
반려 | 상세보기
@@ -108,16 +106,16 @@ function ResourceBookingManageCell(props) {
return (
{props.name} |
- {props.category} |
- {props.startDateTime} ~ {props.endDateTime} |
- {props.requester} ({props.position}) |
+ {props.location} |
+ {props.startDateTime} ~ {props.endDateTime} |
+ {props.reservatorName} ({props.reservatorPhone}) |
{props.status}
|
-
+ |
{status === WAITING ? watingButton :
status === USING ? usingButton :
status === BOOKED ? bookingButton :cancelButton
|