Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …

…into Hotfix-Rooming
Team-Lecue · Jan 19, 2024 · 7885fd4 · 7885fd4
2 parents c46cf99 + 216a02d
commit 7885fd4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/LecueNote/page/LeceuNotePage/index.tsx b/src/LecueNote/page/LeceuNotePage/index.tsx
@@ -36,7 +36,7 @@ function LecueNotePage() {
   const postMutation = usePostLecueNote();
   const location = useLocation();
 
-  const { bookId } = location.state;
+  const { bookId } = location.state || {};
 
   const handleClickCategory = (
     e: React.MouseEvent<HTMLButtonElement, MouseEvent>,

diff --git a/src/Login/page/index.tsx b/src/Login/page/index.tsx
@@ -5,6 +5,7 @@ import LoginBtnContainer from '../components/LoginBtnContainer';
 import * as S from './Login.style';
 
 function Login() {
+  window.localStorage.clear();
   const ref = document.referrer;
   sessionStorage.setItem('url', ref);
 

diff --git a/src/Mypage/components/NoteModal/NoteModal.style.ts b/src/Mypage/components/NoteModal/NoteModal.style.ts
@@ -22,7 +22,7 @@ export const ModalWrapper = styled.div<{
 
   width: 31rem;
   height: 35.8rem;
-  padding: 0.6rem 0.4rem 1.5rem 2rem;
+  padding: 0.6rem 0.6rem 1.5rem 2rem;
 
   border-radius: 0.4rem;
   background-size: 31rem 35.8rem;
@@ -44,20 +44,20 @@ export const Header = styled.header`
   display: flex;
   justify-content: space-between;
   align-items: baseline;
-
-  padding-bottom: 1.5rem;
 `;
 
 export const NameWrapper = styled.div`
   display: flex;
   gap: 1rem;
   align-items: center;
+
+  padding: 2rem 0 1.5rem;
 `;
 
 export const CloseBtn = styled.button`
   width: 3.2rem;
   height: 3.2rem;
-  padding-bottom: 0.3rem;
+  padding-bottom: 0.5rem;
 `;
 
 export const FavoriteName = styled.p`
@@ -67,8 +67,9 @@ export const FavoriteName = styled.p`
 
 export const BodyWrapper = styled.div`
   width: 100%;
-  padding-right: 1.4rem;
+  padding-right: 1.2rem;
 `;
+
 export const Title = styled.p`
   padding-bottom: 0.8rem;
 
@@ -79,19 +80,19 @@ export const ContentWrapper = styled.div`
   overflow-y: scroll;
 
   width: 100%;
-  height: 17.2rem;
+  height: 16.8rem;
   padding-right: 0.6rem;
 `;
 
 export const Content = styled.p`
   width: 100%;
-  height: 17.2rem;
+  height: 16.8rem;
 
   ${({ theme }) => theme.fonts.Body1_R_16};
 `;
 
 export const NoteDate = styled.p`
-  padding: 1.2rem 0;
+  padding: 1rem 0 1.1rem;
 
   ${({ theme }) => theme.fonts.E_Body2_R_14};
   color: ${({ theme }) => theme.colors.DG50};
@@ -106,4 +107,5 @@ export const Button = styled.button`
   border-radius: 0.4rem;
   background-color: ${({ theme }) => theme.colors.black};
   color: ${({ theme }) => theme.colors.white};
+  ${({ theme }) => theme.fonts.Title1_SB_16}
 `;
diff --git a/src/StickerPack/page/StickerPack/index.tsx b/src/StickerPack/page/StickerPack/index.tsx
@@ -17,7 +17,7 @@ function StickerPack() {
   const navigate = useNavigate();
   const location = useLocation();
 
-  const { bookId } = location.state;
+  const { bookId } = location.state || {};
 
   const [selectedStickerData, setSelectedStickerData] = useState<stickerType>({
     stickerId: 0,