diff --git a/src/pages/MyPage/MyPage.jsx b/src/pages/MyPage/MyPage.jsx index d94c2b19..53337973 100644 --- a/src/pages/MyPage/MyPage.jsx +++ b/src/pages/MyPage/MyPage.jsx @@ -34,9 +34,8 @@ const MyPage = () => { const handleLogoutClick = () => setIsLogoutVisible(true); const handleSubscribeClick = () => setIsSubscribeVisible(true); - const handlePrivacyClick = (content) => { - setSelectedContent(content); - setIsPrivacyVisible(true); + const handlePrivacyClick = () => { + return ; }; const handleRoutineChangeClick = () => setRoutineVisible(true); @@ -47,6 +46,7 @@ const MyPage = () => { ); const moveOnstarP = (id) => { + console.log("id:", id); navigate(`/star/${id}`); }; return ( diff --git a/src/pages/RandomDice/RandomDice.jsx b/src/pages/RandomDice/RandomDice.jsx index 1db5327a..7d46a673 100644 --- a/src/pages/RandomDice/RandomDice.jsx +++ b/src/pages/RandomDice/RandomDice.jsx @@ -114,7 +114,9 @@ export const RandomDice = () => { }; const textColor = !showContent ? "black" : "white"; - + const contentArray = data.content.split("-"); + console.log("contentArray", contentArray); + contentArray.shift(); return ( @@ -142,7 +144,11 @@ export const RandomDice = () => { {data.title} - {data.content} + + {contentArray.map((line, index) => ( + ‣ {line.trim()} + ))} + )} {!showContent ? ( diff --git a/src/pages/RandomDice/styled.js b/src/pages/RandomDice/styled.js index 5ed9621a..12ecb9cf 100644 --- a/src/pages/RandomDice/styled.js +++ b/src/pages/RandomDice/styled.js @@ -70,7 +70,22 @@ export const Container = styled.div` } .title { + color: var(--Font-Color, #2a2a2a); + text-align: center; + font-family: "AppleSDGothicNeoL"; font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal; + } + + .routinecontent { + color: rgba(255, 255, 255, 0.7); + font-family: "AppleSDGothicNeoM"; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: normal; } .buttons { display: flex; @@ -83,10 +98,10 @@ export const Container = styled.div` } .Add { display: flex; - width: 100%; + width: 200px; height: 32px; padding: 5px; - + color: white; justify-content: center; align-items: center; flex-shrink: 0; @@ -97,7 +112,7 @@ export const Container = styled.div` .Again { display: flex; - width: 100%; + width: 200px; height: 32px; padding: 5px; justify-content: center;