Merge pull request #75 from 9oormthonUniv-seoultech/develop

3차 배포: 2차배포시 발생한 에러 해결
9oormthonUniv-seoultech · Nov 7, 2024 · 5e3f7de · 5e3f7de
2 parents 75ed9be + bb4e138
commit 5e3f7de
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -43,7 +43,7 @@ function App() {
     return isLoggedIn ? (
       <Outlet /> //로그인 모달창
     ) : (
-      <Navigate to="/login" />
+      <Navigate to="/home" />
     );
   };
 

diff --git a/src/components/Home/Search.tsx b/src/components/Home/Search.tsx
@@ -34,6 +34,11 @@ function Search() {
           placeholder="구, 역, 건물명 등으로 검색해주세요"
           value={address}
           onChange={(e) => setAddress(e.target.value)}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              searchAddressLatLng();
+            }
+          }}
         />
         <button onClick={searchAddressLatLng}>
           <SearchIcon />

diff --git a/src/components/PhotoCheck/HashModal.tsx b/src/components/PhotoCheck/HashModal.tsx
@@ -97,12 +97,14 @@ function HashtagModal({ hashTags, closeModal, setHashTags }: ModalProps) {
 export default HashtagModal;
 
 const ModalOverlay = styled.div`
-  ${tw`fixed inset-0 flex justify-center items-center bg-opacity-50 z-50`}
+  ${tw`fixed inset-0 flex justify-center items-center bg-opacity-50 z-50 `}
   background-color: rgba(23, 28, 36, 0.8);
 `;
 
 const ModalContent = styled.div`
-  ${tw`w-full h-auto relative bg-background rounded-tl-[26px] rounded-tr-[26px] p-8 flex flex-col items-center max-w-[480px]`}
+  ${tw`w-full h-auto relative bg-background rounded-t-[26px] p-8 flex flex-col items-center max-w-[480px] bottom-0 `}
+  position: fixed;
+  bottom: 0;
 `;
 
 const Title = styled.h2`

diff --git a/src/components/PhotoCheck/RecordModal.tsx b/src/components/PhotoCheck/RecordModal.tsx
@@ -77,6 +77,8 @@ const ModalOverlay = styled.div`
 
 const ModalContent = styled.div`
   ${tw`w-full h-auto relative bg-background rounded-tl-[26px] rounded-tr-[26px] p-8 flex flex-col items-center max-w-[480px]`}
+  position: fixed;
+  bottom: 0;
 `;
 
 const Title = styled.h2`

diff --git a/src/pages/My/index.tsx b/src/pages/My/index.tsx
@@ -38,8 +38,8 @@ function My() {
   const handleLogout = async () => {
     const res = await getLogout(accessToken!);
     if (res) {
-      navigate("/home");
       logout();
+      navigate("/home");
     }
   };
   return (

diff --git a/src/pages/PhotoUpload/ReviewPhoto.tsx b/src/pages/PhotoUpload/ReviewPhoto.tsx
@@ -109,6 +109,11 @@ function ReviewPhoto() {
               placeholder="예 : 포토이즘 공릉점"
               value={boothLocation}
               onChange={(e) => setBoothLocation(e.target.value)}
+              onKeyDown={(e) => {
+                if (e.key === "Enter") {
+                  handleSearch();
+                }
+              }}
             />
           </InputContainer>