upgradi ui/ux

AboutClan · Oct 24, 2024 · c2a34d5 · c2a34d5
1 parent 8a9d89d
commit c2a34d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/components/organisms/drawer/BottomFlexDrawer.tsx b/components/organisms/drawer/BottomFlexDrawer.tsx
@@ -94,7 +94,7 @@ export default function BottomFlexDrawer({
       setDrawerHeight(currentHeightRef.current); // 스와이프가 임계값보다 짧으면 원래 높이로 복원
     }
   };
-
+  console.log(25, isHideBottom ? "true" : "false", zIndex);
   return (
     <>
       {isOverlay && <ScreenOverlay zIndex={zIndex} onClick={() => setIsModal(false)} />}
@@ -153,7 +153,7 @@ const Layout = styled.div<{
   border-top-right-radius: 20px;
 
   background-color: white;
-  z-index: ${(props) => props.zindex || (props.ishide ? 700 : 500)};
+  z-index: ${(props) => props.zindex || (props.ishide==="true" ? 700 : 500)};
   padding: 0 20px;
   padding-bottom: ${(props) => props.isdrawerup === "false" && "12px"};
   padding-top: 0;

diff --git a/pageTemplates/vote/StudyControlButton.tsx b/pageTemplates/vote/StudyControlButton.tsx
@@ -1,8 +1,8 @@
 import { Box, Button } from "@chakra-ui/react";
 import dayjs from "dayjs";
+import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { useSearchParams } from "next/navigation";
-import { useSession } from "next-auth/react";
 import { useState } from "react";
 import { useRecoilValue } from "recoil";
 
@@ -51,7 +51,7 @@ function StudyControlButton({ setIsVoteDrawer, setIsDrawerUp, date }: StudyContr
         fontWeight={700}
         color="white"
         position="fixed"
-        zIndex="800"
+        zIndex="400"
         borderRadius="20px"
         lineHeight="24px"
         bottom={`calc(var(--bottom-nav-height) + ${DRAWER_MIN_HEIGHT + iPhoneNotchSize() + 12}px)`}

diff --git a/pages/studyPage.tsx b/pages/studyPage.tsx
@@ -1,7 +1,7 @@
 import { Box } from "@chakra-ui/react";
 import dayjs from "dayjs";
-import { useRouter, useSearchParams } from "next/navigation";
 import { useSession } from "next-auth/react";
+import { useRouter, useSearchParams } from "next/navigation";
 import { useEffect, useRef, useState } from "react";
 import { useRecoilState } from "recoil";
 
@@ -79,7 +79,7 @@ export default function StudyPage() {
   const [isVoteDrawerFirst, setIsVoteDrawerFirst] = useState(true);
 
   const [myStudyParticipation, setMyStudyParticipation] = useRecoilState(myStudyParticipationState);
-  const [isDrawerUp, setIsDrawerUp] = useState(myStudyParticipation ? false : true);
+  const [isDrawerUp, setIsDrawerUp] = useState(false);
 
   const { data: userInfo } = useUserInfoQuery();
   const { data: studyVoteData } = useStudyVoteQuery(date, locationValue, {
@@ -122,7 +122,6 @@ export default function StudyPage() {
       const findMyStudyParticipation = getMyStudyParticipation(studyVoteData, session.user.uid);
       setMyStudyParticipation(findMyStudyParticipation);
       if (findMyStudyParticipation) {
-        setIsDrawerUp(false);
         const changeLocation = getLocationByCoordinates(
           findMyStudyParticipation.place.latitude,
           findMyStudyParticipation.place.longitude,