From be8b3943e621d9b96585dc6eba9c8d11b0887a0a Mon Sep 17 00:00:00 2001 From: kyr4601 Date: Thu, 12 Dec 2024 18:53:20 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Feature:=20PC=EB=B2=84=EC=A0=84=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=EA=B3=B5=EC=9C=A0=20=EB=AA=A8=EB=8B=AC=EC=97=B0?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/src/components/cake/Sidebar.tsx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/apps/client/src/components/cake/Sidebar.tsx b/apps/client/src/components/cake/Sidebar.tsx index c7c8c99..5d2549a 100644 --- a/apps/client/src/components/cake/Sidebar.tsx +++ b/apps/client/src/components/cake/Sidebar.tsx @@ -7,17 +7,21 @@ import { useNavigate } from 'react-router-dom'; import useToggleStore from '../../store/useToggleStore'; import { fetchUserInfo } from '#pages/CreateLetter.tsx'; import axiosInstance from '#apis/axios.ts'; +import ShareUrlModal from '#components/modal/ShareUrlModal.tsx'; const Sidebar: React.FC<{ isMyCake: boolean }> = ({ isMyCake }) => { const navigate = useNavigate(); const setToggle = useToggleStore((state) => state.setToggle); const [user, setUser] = useState(''); + const [nickname, setNickname] = useState(''); const [selectedMenu, setSelectedMenu] = useState('cake'); + const [open, setOpen] = useState(false); useEffect(() => { fetchUserInfo().then((data) => { if (data) { setUser(data.userId); + setNickname(data.nickname); } }); }, []); @@ -52,6 +56,10 @@ const Sidebar: React.FC<{ isMyCake: boolean }> = ({ isMyCake }) => { } } + function handleOpen() { + setOpen(!open); + } + return (
@@ -81,10 +89,15 @@ const Sidebar: React.FC<{ isMyCake: boolean }> = ({ isMyCake }) => { 케이크 수정 -
  • +
  • 링크 공유
    • + {' '} @@ -27,8 +28,9 @@ const Pagenation: React.FC = ({ ); @@ -54,9 +56,16 @@ const PageContainer = styled.div` height: 29px; border-radius: 50%; border: none; + display: flex; + justify-content: center; + align-items: center; background: var(--orange-500); font-family: Pretendard; color: var(--white); + + &.next{ + transform: rotate(180deg); + } } span{ From f35be5321e72ff5e25d271303cb35708f3ff800e Mon Sep 17 00:00:00 2001 From: kyr4601 Date: Sun, 15 Dec 2024 21:32:03 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Fix:=20=EC=BC=80=EC=9D=B4=ED=81=AC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=86=A0=EA=B8=80=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/src/components/common/Toggle.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/client/src/components/common/Toggle.tsx b/apps/client/src/components/common/Toggle.tsx index 55d44a6..f715a78 100644 --- a/apps/client/src/components/common/Toggle.tsx +++ b/apps/client/src/components/common/Toggle.tsx @@ -19,13 +19,13 @@ const Toggle: React.FC = ({ ownerId, toggle, onClick }) => { return ( - + - + - + {toggle ? ( From 568facd03d0cf551c497e65a51ccd4b4d2289223 Mon Sep 17 00:00:00 2001 From: kyr4601 Date: Sun, 15 Dec 2024 21:58:30 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Fix:=20=EB=AA=A8=EB=8B=AC=20UI=20=EA=B9=A8?= =?UTF-8?q?=EC=A7=90=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/src/components/cake/SharedCake.tsx | 3 +- apps/client/src/components/modal/Modal.tsx | 37 ++++++++--------- .../src/components/modal/ShareUrlModal.tsx | 40 ++++++++++++------- 3 files changed, 45 insertions(+), 35 deletions(-) diff --git a/apps/client/src/components/cake/SharedCake.tsx b/apps/client/src/components/cake/SharedCake.tsx index 57d3f51..9dcdea1 100644 --- a/apps/client/src/components/cake/SharedCake.tsx +++ b/apps/client/src/components/cake/SharedCake.tsx @@ -85,8 +85,7 @@ const SharedCake: React.FC = ({ ownerId, data }) => { - 편지를 작성하면 포인트를 얻을 수 있어요. - 로그인 하시겠어요? + 편지를 작성하면 포인트를 얻을 수 있어요.{'\n'}로그인 하시겠어요? + +

    내 케이크 공유하기

    +
    + kakaoShare(nickname)}> + + + facebookShare(nickname)}> + + + + + +
    + +     ); }; @@ -78,3 +80,11 @@ const IconButton = styled.button` cursor: pointer; margin: 0 0.5rem; `; + +const ShareBox = styled.div` + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 24px; +` From 9b043e09d675ec14d31acace023608e7c779736d Mon Sep 17 00:00:00 2001 From: kyr4601 Date: Mon, 16 Dec 2024 19:29:30 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Fix:=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/src/assets/icons/HomeIcon.tsx | 4 ++-- apps/client/src/assets/icons/PersonIcon.tsx | 2 ++ apps/client/src/components/cake/CakeHeader.tsx | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/client/src/assets/icons/HomeIcon.tsx b/apps/client/src/assets/icons/HomeIcon.tsx index 7a1ad2e..56cbe92 100644 --- a/apps/client/src/assets/icons/HomeIcon.tsx +++ b/apps/client/src/assets/icons/HomeIcon.tsx @@ -4,8 +4,8 @@ const HomeIcon = (props: SVGProps) => { return ( ) => { return ( diff --git a/apps/client/src/components/cake/CakeHeader.tsx b/apps/client/src/components/cake/CakeHeader.tsx index b1cf94a..e24ba89 100644 --- a/apps/client/src/components/cake/CakeHeader.tsx +++ b/apps/client/src/components/cake/CakeHeader.tsx @@ -39,12 +39,10 @@ const Phrase = styled.h1` `; const MyPageButton = styled.button` - position: relative; width: 2.6rem; height: 2.6rem; border-radius: 50%; border-width: 0; - display: relative; overflow: hidden; cursor: pointer; display: flex;