Merge pull request #128 from PLADI-ALM/fix/PDW-67-refactoring

[PDW-67/fix] 자잘한 UI 수정
PLADI-ALM · Nov 8, 2023 · de769b4 · de769b4
2 parents 6bc61b0 + 154cd02
commit de769b4
Show file tree

Hide file tree

Showing 25 changed files with 455 additions and 559 deletions.
diff --git a/src/App.js b/src/App.js
@@ -16,7 +16,7 @@ import UserManage from 'pages/admin/user/UserManage';
 import ResourceManage from 'pages/admin/resource/ResourceManage';
 import ResourceManageAdd from "./pages/admin/resource/ResourceManageAdd";
 import ResourceManageDetail from 'pages/admin/resource/ResourceManageDetail';
-import OfficeManageDetail from 'pages/admin/office/OfficeBookingManageDetail';
+import OfficeManageDetail from 'pages/admin/office/OfficeManageDetail';
 
 function App() {
 

diff --git a/src/components/button/ImageFullButton.js b/src/components/button/ImageFullButton.js
@@ -2,13 +2,14 @@ import React from "react";
 import styled from "styled-components";
 
 const Button = styled.button`
-    background: none;
-    border: 0;
-    border-radius: 10px;
-    box-shadow: 0 4px 14px 0 #00000040;
-    padding: 0;
-    align-items: center;
-    display: flex;
+  background: none;
+  border: 0;
+  border-radius: 10px;
+  box-shadow: 0 4px 14px 0 #00000040;
+  padding: 0;
+  align-items: center;
+  display: flex;
+  cursor: pointer;
 `
 
 const Img = styled.img`

diff --git a/src/components/capsule/Capsule.js b/src/components/capsule/Capsule.js
@@ -2,14 +2,15 @@ import React from "react";
 import styled from "styled-components"
 
 const PurpleCapsule = styled.p`
-    border-radius: 20px;
-    background: #A263DE;
-    text-align: center;
-    color: #FFF;
-    font-size: 18px;
-    padding: 7px 15px;
-    margin: 0 10px 0 0;
+  border-radius: 20px;
+  background: #A263DE;
+  text-align: center;
+  color: #FFF;
+  font-size: 18px;
+  padding: 7px 15px;
+  margin: 0 10px 0 0;
   min-width: fit-content;
+  height: fit-content;
 `
 
 const WhiteCapsule = styled(PurpleCapsule)`

diff --git a/src/components/modal/BigModal.js b/src/components/modal/BigModal.js
@@ -43,7 +43,6 @@ export const ExitBtn = styled.button`
   background: none;
   width: 40px;
   height: 40px;
-  font-family: NanumSquare_ac;
   font-size: 40px;
   border: none;
   color: #4C4C4C;

diff --git a/src/components/officeBooking/BookingPurpose.js b/src/components/officeBooking/BookingPurpose.js
@@ -1,7 +1,7 @@
 import styled from "styled-components"
 
 export const BookingPurposeContainer = styled.div`
-  margin: 20px 0 20px 20px;
+  margin-left: 20px;
   display: flex;
   align-items: flex-start;
 `
@@ -19,10 +19,9 @@ export const BookingCapsuleContainer = styled.div`
 
 export const PurposeContainer = styled.p`
   display: flex;
-  width: 90%;
-  padding: 7px 0 7px 10px;
-  font-size: 20px;
-  font-weight: 400;
+  flex: 1;
+  font-size: 22px;
   text-align: left;
-  margin: 0 10px;
+  margin-left: 10px;
+  line-height: 34px;
 `
diff --git a/src/components/officeBooking/BookingTimeBar.js b/src/components/officeBooking/BookingTimeBar.js
@@ -18,8 +18,9 @@ let endT = -1;
 let bookedTimeList = [];
 
 export const BookingContentContainer = styled.div`
-  margin: 30px 0 20px 20px;
+  margin: 30px 0 30px 20px;
   display: flex;
+  align-items: baseline;
 `
 
 export const BookingDateTextContainer = styled.div`
@@ -33,7 +34,7 @@ export const BookingTimeContainer = styled.div`
 `
 
 export const RequestButtonContainer = styled.div`
-  margin: 0 20px 20px 0;
+  margin: 20px;
   display: flex;
   justify-content: flex-end;
 `

diff --git a/src/components/rightContainer/RightContainer.js b/src/components/rightContainer/RightContainer.js
@@ -15,7 +15,7 @@ export const WhiteContainer = styled.div`
     background: #FFF;
     box-shadow: 0px 4px 14px 0px rgba(0, 0, 0, 0.25);
     overflow-y: scroll;
-    display: grid;
+    //display: grid;
     height: 100%;
     width: 100%;
     position: relative;

diff --git a/src/components/searchBar/ManageSearchBar.js b/src/components/searchBar/ManageSearchBar.js
@@ -67,16 +67,15 @@ export const ManageAddButtonImage = styled.img`
 function ManageSearchBar(props) {
 
     const handleOnKeyPress = e => {
-        if (e.key === 'Enter') {
-            props.onEnter(e) // Enter 입력이 되면 클릭 이벤트 실행
-        }
+        // if (e.key === 'Enter')
+        props.onEnter(e) // Enter 입력이 되면 클릭 이벤트 실행
     };
 
     return (
         <Container>
             <ManageSearchContainer>
                 <ManageSearchImage src={SearchInputImage}/>
-                <ManageSearchText onKeyUp={handleOnKeyPress} placeholder="이름 검색"/>
+                <ManageSearchText onChange={handleOnKeyPress} placeholder="이름 검색"/>
             </ManageSearchContainer>
             {
                 props.selectOptions !== null ?

diff --git a/src/constants/Path.js b/src/constants/Path.js
@@ -32,6 +32,7 @@ export const ADMIN_MENUS = [
     { name: '직원 관리', path: '/admin/users' },
     { name: '회의실 관리', path: '/admin/offices' },
     { name: '장비 관리', path: '/admin/resources' },
+    { name: '차량 관리', path: '/admin/cars' },
     { name: '회의실 예약 관리', path: '/admin/officeBooking' },
     { name: '장비 예약 관리', path: '/admin/resourceBooking' },
     { name: '차량 예약 관리', path: '/admin/carBooking' }

diff --git a/src/index.css b/src/index.css
@@ -22,10 +22,9 @@ a {
 input, button, select, text, p, textarea {
   font-family: 'NanumSquare_ac';
   outline: none;
-}
-
-textarea {
+  word-break: break-all;
   resize: none;
+  margin: 0;
 }
 
 ::-webkit-scrollbar {

diff --git a/src/pages/admin/office/OfficeBookingManageDetail.js b/src/pages/admin/office/OfficeBookingManageDetail.js