Merge pull request #114 from EFUB4-Jukebox/dev

main 브랜치로 merge
EFUB4-Jukebox · Aug 21, 2024 · 4759a68 · 4759a68
2 parents 4f4efd1 + b808971
commit 4759a68
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/components/MusicSearchPage/MusicInfoPinPreview.jsx b/src/components/MusicSearchPage/MusicInfoPinPreview.jsx
@@ -112,7 +112,7 @@ const MusicInfoPinPreview = ({ pin, onSelectedLocation = () => {} }) => {
           >
             {visibility === "PRIVATE" && <SecretPin src={lockIcon} />}
             {visibility === "PRIVATE" && !isMine
-              ? "비공개 메모입니다"
+              ? "비공개 메모입니다."
               : displayText}
             {showMoreBtn && isTruncated && (
               <MoreBtn onClick={toggleTruncation}> ...더보기</MoreBtn>

diff --git 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
@@ -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 => {

diff --git 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;
 `;