Merge pull request #348 from LikeLion-at-DGU/dev

🚀 Deploy
LikeLion-at-DGU · Aug 5, 2024 · b120024 · b120024
2 parents d6a7355 + 930b55c
commit b120024
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git 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 <AgreePage />;
   };
 
   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
@@ -114,7 +114,9 @@ export const RandomDice = () => {
   };
 
   const textColor = !showContent ? "black" : "white";
-
+  const contentArray = data.content.split("-");
+  console.log("contentArray", contentArray);
+  contentArray.shift();
   return (
     <S.Layout>
       <GradientBackground showContent={showContent} />
@@ -142,7 +144,11 @@ export const RandomDice = () => {
           <div className="content">
             <div className="title">{data.title}</div>
 
-            <div>{data.content}</div>
+            <div className="routinecontent">
+              {contentArray.map((line, index) => (
+                <div key={index}>‣ {line.trim()}</div>
+              ))}
+            </div>
           </div>
         )}
         {!showContent ? (

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