Merge pull request #63 from PLADI-ALM/feat/PDW-54-manager-resource-2

[PDW-54/Fix] 자원 예약 상세보기 수정 및 Link 코드 삭제
PLADI-ALM · Oct 11, 2023 · 60913b5 · 60913b5
2 parents 4c3c736 + 3845046
commit 60913b5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 57 deletions.
diff --git a/src/components/resourceInfo/ResourceInfo.js b/src/components/resourceInfo/ResourceInfo.js
@@ -3,6 +3,7 @@ import styled from "styled-components"
 import Example from '../../assets/images/example.png'
 import Capsule from "components/capsule/Capsule";
 import { ResourceCard, CardText, DetailContainer, ResourceCardImage, InfoContainer, DescriptionContainer, OfficeContentText, ResourceTitle } from "components/card/Card";
+import { useNavigate } from "react-router-dom";
 
 // 자원명 컨테이너
 const ResourceTitleContainer = styled.div`
@@ -12,9 +13,17 @@ const ResourceTitleContainer = styled.div`
 `
 
 
+
+
+
 function ResourceInfo(props) {
+    const moveToDetail = () => {
+        window.location.href = "/resourceBooking/"+props.resourceId
+    }
+
+
     return (
-        <ResourceCard onClick={props.click}>
+        <ResourceCard  onClick={props.detail===true ? moveToDetail : {}}>
             <DetailContainer>
                 <ResourceCardImage src={Example} />
 

diff --git a/src/pages/booking/selectResource/SelectResource.js b/src/pages/booking/selectResource/SelectResource.js
@@ -5,6 +5,7 @@ import React, { useState, useEffect } from "react";
 import styled from "styled-components";
 import ResourceInfo from "components/resourceInfo/ResourceInfo";
 import { ResourcesAxios } from "api/AxiosApi";
+import { useNavigate } from "react-router-dom";
 
 
 export const SearchTitleContainer = styled.div`
@@ -61,6 +62,7 @@ export const SearchDateInput = styled.input`
 `
 
 function SelectResource(props) {
+    const navigate = useNavigate();
 
     const [resourceList, setResourceList] = useState([]);
     const [resourceName, setResourceName] = useState("");
@@ -118,7 +120,7 @@ function SelectResource(props) {
 
             <WhiteContainer>
                 <div className="cardList">
-                    {resourceList.length === 0 ? <label>예약 가능한 자원이 없습니다.</label> : resourceList.map((resource) => <ResourceInfo key={resource.resourceId} name={resource.name} image={resource.imgUrl} category={resource.category} description={resource.description} />)}
+                    {resourceList.length === 0 ? <label>예약 가능한 자원이 없습니다.</label> : resourceList.map((resource, index) => <ResourceInfo key={resource.index} detail={true} resourceId={resource.resourceId} name={resource.name} image={resource.imgUrl} category={resource.category} description={resource.description} />)}
                 </div>
             </WhiteContainer>
         </RightContainer>

diff --git a/src/pages/manager/officeBookingManage/OfficeBookingManageCell.js b/src/pages/manager/officeBookingManage/OfficeBookingManageCell.js
@@ -49,31 +49,21 @@ function OfficeBookingManageCell(props) {
         }
     };
 
+    const moveToDetail = () => {
+        window.location.href = `/manage/officeBooking/${props.id}`
+    };
+
+
 
 
 
     var status = findStatus(props.status)
     var cancelButton = (
-    <SettingButtonContainer>
-        <SettingButton><Link style={{
-              color: "#8741CB",
-              fontSize: "20px",
-              fontStyle: "normal",
-              fontWeight: "400",
-              lineHeight: "22px", 
-        }} 
-        to={`/manage/officeBooking/${props.id}`}>상세보기</Link></SettingButton>    
-    </SettingButtonContainer>)
+    <SettingButtonContainer><SettingButton onClick={moveToDetail}>상세보기</SettingButton></SettingButtonContainer>)
+
     var usingButton = (
     <SettingButtonContainer>
-        <SettingButton onClick={rejectResource}>반려</SettingButton> | <SettingButton><Link to={`/manage/officeBooking/${props.id}`} 
-        style={{
-              color: "#8741CB",
-              fontSize: "20px",
-              fontStyle: "normal",
-              fontWeight: "400",
-              lineHeight: "22px", 
-        }}>상세보기</Link></SettingButton> 
+        <SettingButton onClick={rejectResource}>반려</SettingButton> |<SettingButton onClick={moveToDetail}>상세보기</SettingButton>  
     </SettingButtonContainer>)
 
     return (

diff --git a/src/pages/manager/resourceBookingManage/ResourceBookingManageCell.js b/src/pages/manager/resourceBookingManage/ResourceBookingManageCell.js
@@ -96,53 +96,24 @@ function ResourceBookingManageCell(props) {
         }
     };
 
+    const moveToDetail = () => {
+        window.location.href = `/manage/resourceBooking/${props.id}`
+    };
 
 
 
     var status = findStatus(props.status)
     var watingButton = (
     <SettingButtonContainer>
-        <SettingButton onClick={allowResource}>허가</SettingButton> | <SettingButton onClick={rejectResource}>반려</SettingButton> |  
-        <SettingButton>
-            <Link style={{
-              color: "#8741CB",
-              fontSize: "20px",
-              fontStyle: "normal",
-              fontWeight: "400",
-              lineHeight: "22px", }} 
-              to={`/manage/resourceBooking/${props.id}`}>
-            상세보기
-            </Link>
-        </SettingButton>  
+        <SettingButton onClick={allowResource}>허가</SettingButton> | <SettingButton onClick={rejectResource}>반려</SettingButton> |  <SettingButton onClick={moveToDetail}>상세보기</SettingButton>  
     </SettingButtonContainer>)
+
     var cancelButton = (
-    <SettingButtonContainer>
-         <SettingButton>
-            <Link style={{
-              color: "#8741CB",
-              fontSize: "20px",
-              fontStyle: "normal",
-              fontWeight: "400",
-              lineHeight: "22px", }} 
-              to={`/manage/resourceBooking/${props.id}`}>
-            상세보기
-            </Link>
-        </SettingButton>    
-    </SettingButtonContainer>)
+    <SettingButtonContainer><SettingButton onClick={moveToDetail}>상세보기</SettingButton></SettingButtonContainer>)
+
     var usingButton = (
     <SettingButtonContainer>
-        <SettingButton onClick={returnResource}>반납</SettingButton> | 
-        <SettingButton>
-            <Link style={{
-              color: "#8741CB",
-              fontSize: "20px",
-              fontStyle: "normal",
-              fontWeight: "400",
-              lineHeight: "22px", }} 
-              to={`/manage/resourceBooking/${props.id}`}>
-            상세보기
-            </Link>
-        </SettingButton>  
+        <SettingButton onClick={returnResource}>반납</SettingButton> | <SettingButton onClick={moveToDetail}>상세보기</SettingButton>  
     </SettingButtonContainer>)
 
     return (