From 74a73a47a5ac6ed801275946274bd27d1e0b0ed1 Mon Sep 17 00:00:00 2001
From: Doyun Lee <doyn511@ajou.ac.kr>
Date: Sat, 20 Jan 2024 02:53:21 +0900
Subject: [PATCH 1/3] =?UTF-8?q?style:=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=AA=A8=EB=8B=AC=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=95=84=EC=9B=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NoteModal/NoteModal.style.ts    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Mypage/components/NoteModal/NoteModal.style.ts b/src/Mypage/components/NoteModal/NoteModal.style.ts
index 9f8fc72a..e15c8996 100644
--- 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}
 `;

From 242a045b89f85cd76dfdae182667e5d9aebe37f7 Mon Sep 17 00:00:00 2001
From: Doyun Lee <doyn511@ajou.ac.kr>
Date: Sat, 20 Jan 2024 03:11:57 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=A1=9C=EC=BB=AC=20=EC=8A=A4?=
 =?UTF-8?q?=ED=86=A0=EB=A6=AC=EC=A7=80=20=EB=B9=84=EC=9A=B0=EA=B8=B0=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Login/page/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Login/page/index.tsx b/src/Login/page/index.tsx
index 6938af2e..4f1ab373 100644
--- 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);
 

From 216a02dab5abe33d043c7c94fab032b75dccc383 Mon Sep 17 00:00:00 2001
From: eunbenn <ds5bean23@gmail.com>
Date: Sat, 20 Jan 2024 03:37:20 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20bookId=20null=EC=9D=B4=EB=A9=B4=20?=
 =?UTF-8?q?=EB=B9=88=EB=B0=B0=EC=97=B4=20=EB=B3=B4=EB=82=B4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/LecueNote/page/LeceuNotePage/index.tsx | 2 +-
 src/StickerPack/page/StickerPack/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/LecueNote/page/LeceuNotePage/index.tsx b/src/LecueNote/page/LeceuNotePage/index.tsx
index c8ad7184..2d01a324 100644
--- 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/StickerPack/page/StickerPack/index.tsx b/src/StickerPack/page/StickerPack/index.tsx
index a0b4c859..59d0059a 100644
--- 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,