Skip to content

Commit

Permalink
Merge pull request #220 from LikeLion-at-DGU/dev
Browse files Browse the repository at this point in the history
🚀 Deploy
  • Loading branch information
Chaem03 authored Aug 3, 2024
2 parents 23be83d + b10e78d commit 03fa5ea
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 23 deletions.
49 changes: 26 additions & 23 deletions src/components/PrivacyContent/PrivacyContent.jsx
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
import React from "react";
import { AGREE_TEXT } from "../../constants/Text/title";
import * as S from "./styled";
const WrapperContent = ({ selectedText, onBackBtnClick, contentsNumber }) => (
<S.Wrapper>
{selectedText && (
<>
<div className="title">{selectedText}</div>
const WrapperContent = ({ selectedText, onBackBtnClick, contentsNumber }) => {
console.log("내용 불러오기 성공");
return (
<S.Wrapper>
{selectedText && (
<>
<div className="title">{selectedText}</div>

{AGREE_TEXT[contentsNumber].map((text, key) => (
<div key={key} className="content">
<p>{text}</p>
</div>
))}
</>
)}
<button
style={{
marginBottom: "2rem",
}}
className="backBtn"
onClick={onBackBtnClick}
>
뒤로가기
</button>
</S.Wrapper>
);
{AGREE_TEXT[contentsNumber].map((text, key) => (
<div key={key} className="content">
<p>{text}</p>
</div>
))}
</>
)}
<button
style={{
marginBottom: "2rem",
}}
className="backBtn"
onClick={onBackBtnClick}
>
뒤로가기
</button>
</S.Wrapper>
);
};

export default WrapperContent;
1 change: 1 addition & 0 deletions src/components/RoutineChange/RoutineChange.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const ChangeRoutine = () => {
);

setCategoryStatus(initialStatus);
console.log("initialStatus:", initialStatus);
} catch (err) {
console.log(err);
}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/MyPage/MyPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@ const MyPage = () => {
const handlePrivacyClick = (content) => {
setSelectedContent(content);
setIsPrivacyVisible(true);
console.log(content);
};

const handleRoutineChangeClick = () => {
setRoutineVisible(true);
console.log("맞춤형루틴 true");
};

const handleBackBtnClick = () => {
Expand Down
1 change: 1 addition & 0 deletions src/pages/MyPage/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const Layout = styled.div`
flex-direction: column;
justify-content: space-around;
gap: 5px;
margin-bottom: 20rem;
@media (min-height: 720px) {
justify-content: flex-start;
gap: 40px;
Expand Down

0 comments on commit 03fa5ea

Please sign in to comment.