From d12eb3c134fd457df9d0f56306ad0440d58b0226 Mon Sep 17 00:00:00 2001 From: YoungseoChoi23 Date: Wed, 21 Aug 2024 20:50:33 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=92=84=20Style=20:=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20min-width=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/IntroducePage/Main.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/IntroducePage/Main.jsx b/src/pages/IntroducePage/Main.jsx index ca262230..d9f36929 100644 --- a/src/pages/IntroducePage/Main.jsx +++ b/src/pages/IntroducePage/Main.jsx @@ -49,7 +49,7 @@ const BackgroundWrapper = styled.div` z-index: 0; `; const Wrapper = styled.div` - width: 100vw; + min-width: 1920px; position: relative; z-index: 1; `; From b80897169c0bae0e0fa83d1758cd9ffea85af411 Mon Sep 17 00:00:00 2001 From: YoungseoChoi23 Date: Wed, 21 Aug 2024 21:18:37 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=92=84=20Style=20:=20=EB=B9=84?= =?UTF-8?q?=EA=B3=B5=EA=B0=9C=20=EB=A9=94=EB=AA=A8=EC=9E=85=EB=8B=88?= =?UTF-8?q?=EB=8B=A4=20=EC=97=90=20.=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MusicSearchPage/MusicInfoPinPreview.jsx | 2 +- src/components/MyPage/PinMemoComponent.jsx | 5 ++++- src/components/PlaylistPage/PinComponent.jsx | 14 +++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/components/MusicSearchPage/MusicInfoPinPreview.jsx b/src/components/MusicSearchPage/MusicInfoPinPreview.jsx index 68afa879..925e3045 100644 --- a/src/components/MusicSearchPage/MusicInfoPinPreview.jsx +++ b/src/components/MusicSearchPage/MusicInfoPinPreview.jsx @@ -112,7 +112,7 @@ const MusicInfoPinPreview = ({ pin, onSelectedLocation = () => {} }) => { > {visibility === "PRIVATE" && } {visibility === "PRIVATE" && !isMine - ? "비공개 메모입니다" + ? "비공개 메모입니다." : displayText} {showMoreBtn && isTruncated && ( ...더보기 diff --git a/src/components/MyPage/PinMemoComponent.jsx b/src/components/MyPage/PinMemoComponent.jsx index 79a047ba..425aeb02 100644 --- a/src/components/MyPage/PinMemoComponent.jsx +++ b/src/components/MyPage/PinMemoComponent.jsx @@ -31,7 +31,10 @@ const PinMemoComponent = ({ setIsTruncated(!isTruncated); }; - const text = memo || "메모가 비어 있습니다"; + const text = + visibility === "PUBLIC" + ? memo || "메모가 비어 있습니다" + : "비공개 메모입니다."; const maxLines = 2; const showMoreBtn = text.split("\n").length > maxLines; const displayText = isTruncated diff --git a/src/components/PlaylistPage/PinComponent.jsx b/src/components/PlaylistPage/PinComponent.jsx index c1394558..bfe60cd0 100644 --- a/src/components/PlaylistPage/PinComponent.jsx +++ b/src/components/PlaylistPage/PinComponent.jsx @@ -23,7 +23,19 @@ const PinComponent = ({ if (selectable) { onSelect(pin.playlistPinId); } else { - navigate(`/details-song/${pin.songInfo.songId}`); + const path = window.location.pathname; + const segments = path.split("/").filter(segment => segment); // 빈 문자열을 필터링 + + const firstSegment = segments[0] || ""; + const secondSegment = segments[1] || ""; + + const combinedSegments = secondSegment + ? `${firstSegment}/${secondSegment}` + : firstSegment; + + navigate(`/details-song/${pin.songInfo.songId}`, { + state: `/${combinedSegments}`, + }); } }; const getGenreIcon = genreName => {