From f232cd84bd72b83c2afb0a19ff6592981cf40c3a Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Sat, 20 Jan 2024 06:33:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EA=B0=9C=ED=96=89=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/LecueNoteModal/LecueNoteModal.style.ts | 2 ++ src/Mypage/components/LecueNote/LecueNote.style.ts | 2 ++ src/Mypage/components/NoteModal/NoteModal.style.ts | 1 + 3 files changed, 5 insertions(+) diff --git a/src/Detail/components/LecueNoteModal/LecueNoteModal.style.ts b/src/Detail/components/LecueNoteModal/LecueNoteModal.style.ts index dcc3fed6..0f99f924 100644 --- a/src/Detail/components/LecueNoteModal/LecueNoteModal.style.ts +++ b/src/Detail/components/LecueNoteModal/LecueNoteModal.style.ts @@ -68,6 +68,8 @@ export const LecueNoteModalContent = styled.p` max-height: 100%; ${({ theme }) => theme.fonts.Title2_M_16}; + + white-space: pre-wrap; `; export const LecueNoteModalDate = styled.p` diff --git a/src/Mypage/components/LecueNote/LecueNote.style.ts b/src/Mypage/components/LecueNote/LecueNote.style.ts index 011ea692..c38d3d1d 100644 --- a/src/Mypage/components/LecueNote/LecueNote.style.ts +++ b/src/Mypage/components/LecueNote/LecueNote.style.ts @@ -62,6 +62,8 @@ export const Content = styled.p` ${({ theme }) => theme.fonts.Body3_R_14}; text-overflow: ellipsis; + + white-space: pre-wrap; `; export const Date = styled.p` diff --git a/src/Mypage/components/NoteModal/NoteModal.style.ts b/src/Mypage/components/NoteModal/NoteModal.style.ts index 530a2478..17d253fd 100644 --- a/src/Mypage/components/NoteModal/NoteModal.style.ts +++ b/src/Mypage/components/NoteModal/NoteModal.style.ts @@ -89,6 +89,7 @@ export const Content = styled.p` height: 16.8rem; ${({ theme }) => theme.fonts.Body1_R_16}; + white-space: pre-wrap; `; export const NoteDate = styled.p` From 9805d30859530eaf2090882a3cccae593df1b4eb Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Sat, 20 Jan 2024 06:52:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=ED=86=A0=ED=81=B0=20=EC=A7=80?= =?UTF-8?q?=EC=9A=B0=EB=8A=94=20=EA=B2=BD=EB=A1=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Router.tsx | 2 ++ src/components/common/ClearToken/ClearToken.tsx | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 src/components/common/ClearToken/ClearToken.tsx diff --git a/src/Router.tsx b/src/Router.tsx index 5b31c870..b23ae087 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -5,6 +5,7 @@ import { useQueryErrorResetBoundary } from 'react-query'; import { BrowserRouter, Route, Routes } from 'react-router-dom'; import BoundaryErrorPage from './components/common/BoundaryErrorPage'; +import ClearToken from './components/common/ClearToken/ClearToken'; import ErrorPage from './components/common/ErrorPage'; import LoadingPage from './components/common/LoadingPage'; import CreateBook from './CreateBook/page'; @@ -47,6 +48,7 @@ function Router() { } /> } /> } /> + } /> } /> diff --git a/src/components/common/ClearToken/ClearToken.tsx b/src/components/common/ClearToken/ClearToken.tsx new file mode 100644 index 00000000..1f98dd6f --- /dev/null +++ b/src/components/common/ClearToken/ClearToken.tsx @@ -0,0 +1,7 @@ +function ClearToken() { + window.localStorage.clear(); + + return
clear token
; +} + +export default ClearToken;