hotfix

AboutClan · Jun 1, 2024 · 5781e55 · 5781e55
1 parent 4cb83f6
commit 5781e55
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/pageTemplates/vote/VoteDrawer.tsx b/pageTemplates/vote/VoteDrawer.tsx
@@ -57,6 +57,7 @@ function VoteDrawer({ studyVoteData, myVote, setMyVote, setActionType }: VoteDra
   useEffect(() => {
     if (!myVote?.place) {
       const items = getSortedMainPlace(studyVoteData, savedPrefer);
+      console.log(4, items);
       setPlaceItems(items);
       return;
     }
@@ -73,9 +74,16 @@ function VoteDrawer({ studyVoteData, myVote, setMyVote, setActionType }: VoteDra
   }, [myVote?.place, myVote?.subPlace]);
 
   const mainPlace = items?.find((item) => item.place._id === myVote?.place?._id);
+  const bodyWidth = document.body.clientWidth;
+  const bodyHeight = document.body.clientHeight;
 
   return (
-    <BottomDrawerLg setIsModal={() => {}} height={300} isxpadding={false} isOverlay={false}>
+    <BottomDrawerLg
+      height={bodyHeight - bodyWidth - 74}
+      setIsModal={() => {}}
+      isxpadding={false}
+      isOverlay={false}
+    >
       {mainPlace ? (
         <VoteDrawerMainItem
           voteCnt={mainPlace?.voteCnt}

diff --git a/pageTemplates/vote/voteDrawer/VoteDrawerQuickVoteItem.tsx b/pageTemplates/vote/voteDrawer/VoteDrawerQuickVoteItem.tsx
@@ -1,6 +1,7 @@
 import { Box, Flex } from "@chakra-ui/react";
 import styled from "styled-components";
 
+import { useToast } from "../../../hooks/custom/CustomToast";
 import { DispatchType } from "../../../types/hooks/reactTypes";
 import { IPlace } from "../../../types/models/studyTypes/studyDetails";
 import { IStudyVoteWithPlace } from "../../../types/models/studyTypes/studyInterActions";
@@ -11,21 +12,26 @@ interface VoteDrawerQuickVoteItemProps {
 }
 
 function VoteDrawerQuickVoteItem({ savedPreferPlace, setMyVote }: VoteDrawerQuickVoteItemProps) {
-  const favoritesCnt = (savedPreferPlace?.place ? 1 : 0) + savedPreferPlace?.subPlace?.length;
+  const toast = useToast();
+  const favoritesCnt = (savedPreferPlace?.place ? 1 : 0) + savedPreferPlace?.subPlace?.length || 0;
   return (
     <Flex
       py="8px"
       align="center"
       pl="16px"
       pr="20px"
       borderBottom="var(--border-main)"
-      onClick={() =>
+      onClick={() => {
+        if (favoritesCnt === 0) {
+          toast("warning", "즐겨찾기중인 장소가 없습니다.");
+          return;
+        }
         setMyVote((old) => ({
           ...old,
           place: savedPreferPlace.place,
           subPlace: savedPreferPlace.subPlace,
-        }))
-      }
+        }));
+      }}
       as="button"
       w="100%"
     >
@@ -38,7 +44,7 @@ function VoteDrawerQuickVoteItem({ savedPreferPlace, setMyVote }: VoteDrawerQuic
           빠른 투표
         </Box>
         <Box color="var(--gray-600)" fontSize="14px">
-          <Box as="span">등록된 장소:{favoritesCnt}개</Box>
+          <Box as="span">등록된 장소:{favoritesCnt || 0}개</Box>
         </Box>
       </Flex>
     </Flex>

diff --git a/pages/vote.tsx b/pages/vote.tsx
@@ -89,6 +89,7 @@ export default function StudyVoteMap() {
   return (
     <>
       <Header title="스터디 투표" />
+
       <MapLayout>
         <VoteMap
           mapOptions={mapOptions}
@@ -105,6 +106,7 @@ export default function StudyVoteMap() {
           setActionType={setActionType}
         />
       )}
+
       <VoteTimeDrawer
         myVote={
           myVote && {