Merge pull request #123 from KUIT-Space/feat#96-space-home

Feat#96 space home
KUIT-Space · Aug 20, 2024 · 9b5a74a · 9b5a74a
2 parents acb6ed0 + 76abc83
commit 9b5a74a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/src/pages/PayPage/MyRequestPayPage.tsx b/src/pages/PayPage/MyRequestPayPage.tsx
@@ -27,10 +27,6 @@ const MyRequestPayPage = () => {
     { name: "미정산", content: "Tab menu ONE" },
     { name: "정산완료", content: "Tab menu TWO" },
   ];
-  const dataArr = [
-    { image: "aa", name: "박규환", amount: "15000원", chk: true },
-    { image: "aa", name: "박규환", amount: "15000원", chk: true },
-  ];
   const selectMenuHandler = (index: number) => {
     setTabIndex(index);
   };
@@ -53,13 +49,14 @@ const MyRequestPayPage = () => {
       if (detailData.payTargetInfoDtoList !== undefined) {
         detailData.payTargetInfoDtoList.map((value, index) => {
           {
-            value.isComplete
+            value.complete
               ? setCompleteTargetList((activeVrList) => [...(activeVrList || []), value])
               : setInCompleteTargetList((inactiveVrList) => [...(inactiveVrList || []), value]);
           }
         });
       }
     }
+    console.log(detailData);
   }, [detailData]);
 
   useEffect(() => {
@@ -125,7 +122,7 @@ const MyRequestPayPage = () => {
               <s.AllPriceDiv> / {totalAmount}원</s.AllPriceDiv>
             </s.RowFlexDiv>
             {/* TODO date */}
-            <s.GrayTextDiv>요청 날짜 2024.06.12</s.GrayTextDiv>
+            <s.GrayTextDiv>요청 날짜 2024.08.20</s.GrayTextDiv>
           </s.CompletePayDiv>
           <s.TabMenu>
             {menuArr.map((value, index) => (
@@ -142,7 +139,7 @@ const MyRequestPayPage = () => {
             <s.RoundDiv style={{ margin: "0.75rem 1.25rem 0.75rem 1.25rem" }}>
               {completeTargetList.length === 0 ? (
                 <>
-                  <s.NoAlertDiv>미정산 된 유저가 없어요!</s.NoAlertDiv>
+                  <s.NoAlertDiv>정산완료 된 유저가 없어요!</s.NoAlertDiv>
                 </>
               ) : (
                 <>
@@ -156,7 +153,7 @@ const MyRequestPayPage = () => {
             <s.RoundDiv style={{ margin: "0.75rem 1.25rem 0.75rem 1.25rem" }}>
               {inCompleteTargetList.length === 0 ? (
                 <>
-                  <s.NoAlertDiv>정산완료 된 유저가 없어요!</s.NoAlertDiv>
+                  <s.NoAlertDiv>미정산 된 유저가 없어요!</s.NoAlertDiv>
                 </>
               ) : (
                 <>

diff --git a/src/pages/PayPage/PayPage.tsx b/src/pages/PayPage/PayPage.tsx
@@ -43,7 +43,7 @@ export type payTargetInfoDtoList = {
   targetUserName: string;
   targetUserProfileImg: string;
   requestAmount: number;
-  isComplete: boolean;
+  complete: boolean;
 };
 const PayRequestInfo = ({ data }: { data: PayRequestInfo }) => {
   const res: number = data.totalTargetNum - data.receiveTargetNum;
@@ -79,8 +79,7 @@ const PayPage = () => {
     // RequestPayInfo(setReqData, setRecData);
   }, [reqData]);
   useEffect(() => {
-    // const str = localStorage.getItem("SpaceId");
-    const str = "3";
+    const str = localStorage.getItem("spaceId");
 
     if (str !== null) {
       const SpaceID = Number.parseInt(str);

diff --git a/src/pages/PayPage/PayResult.tsx b/src/pages/PayPage/PayResult.tsx
@@ -2,10 +2,11 @@ import * as s from "@/pages/PayPage/PayPage.styled";
 import bell from "@/assets/PayPage/bell.svg";
 import check from "@/assets/PayPage/check.svg";
 import ReactImg from "@/assets/react.svg";
-import { payTargetInfoDtoList } from "./PayPage";
+import { addComma, payTargetInfoDtoList } from "./PayPage";
 import { getUserDefaultImageURL } from "@/utils/getUserDefaultImageURL";
 
 const PayResult = ({ props }: { props: payTargetInfoDtoList }) => {
+  const price = addComma(props.requestAmount);
   return (
     <s.RowFlexDiv style={{ alignItems: "center", padding: "0.25rem" }}>
       <img
@@ -17,12 +18,12 @@ const PayResult = ({ props }: { props: payTargetInfoDtoList }) => {
         width={"40px"}
         height={"40px"}
       ></img>
-      <s.ColumnFlexDiv style={{ marginLeft: "0.75rem", justifyContent: "left" }}>
+      <s.ColumnFlexDiv style={{ marginLeft: "0.75rem", justifyContent: "start" }}>
         <s.TextDiv>{props.targetUserName}</s.TextDiv>
-        <s.BoldText>{props.requestAmount}</s.BoldText>
+        <s.BoldText style={{ textAlign: "start" }}>{price}원</s.BoldText>
       </s.ColumnFlexDiv>
       <img
-        src={props.isComplete ? check : bell}
+        src={props.complete ? check : bell}
         width={"36px"}
         height={"36px"}
         style={{ marginLeft: "auto" }}

diff --git a/src/pages/PayPage/RequestedPayPage.tsx b/src/pages/PayPage/RequestedPayPage.tsx
@@ -15,7 +15,12 @@ const RequestedPayPage = () => {
   const [currentData, setCurrentData] = useState<PayReceiveInfo[] | undefined>([]);
   const [completeData, setCompleteData] = useState<PayReceiveInfo[] | undefined>([]);
   useEffect(() => {
-    payReceiveApi(3, setCurrentData, setCompleteData);
+    const str = localStorage.getItem("spaceId");
+
+    if (str !== null) {
+      const spaceId = Number.parseInt(str);
+      payReceiveApi(spaceId, setCurrentData, setCompleteData);
+    }
   }, []);
   return (
     <>

diff --git a/src/pages/SpacePage/SpacePage.tsx b/src/pages/SpacePage/SpacePage.tsx
@@ -128,7 +128,7 @@ const SpacePage = () => {
 
   useEffect(() => {
     //TODO : 임시로 초대받은 스페이스를 배열에 추가 (ex. spaceId: 3, 6, 9)
-    const tempInviteSpace = [3, 6, 9, 11];
+    const tempInviteSpace = [3, 202];
     Promise.all(
       tempInviteSpace.map(async (spaceId) => {
         let spaceInfo: SpaceInfo = {

diff --git a/src/pages/VoiceRoomPage/VoiceRoomListPage.tsx b/src/pages/VoiceRoomPage/VoiceRoomListPage.tsx
@@ -80,7 +80,11 @@ const VoiceRoomListPage = () => {
   }, []);
 
   useEffect(() => {
-    filterVrList();
+    if (vrList?.length !== 0) {
+      filterVrList();
+    } else {
+      setIsLoading(false);
+    }
   }, [vrList]);
 
   useEffect(() => {