From 65efda03da38a5be988016b58969986b96526ce6 Mon Sep 17 00:00:00 2001 From: leejiho9898 Date: Sun, 23 Jul 2023 02:41:47 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat=20=EC=A2=8B=EC=95=84=EC=9A=94=20?= =?UTF-8?q?=EC=9D=B8=ED=84=B0=EB=A0=89=EC=85=98=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/components/detail/Comment.tsx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/web/components/detail/Comment.tsx b/apps/web/components/detail/Comment.tsx index 92e5f59d..be1066b5 100644 --- a/apps/web/components/detail/Comment.tsx +++ b/apps/web/components/detail/Comment.tsx @@ -61,8 +61,10 @@ function Comment({ comment, mutateDeleteComment, mutateLike, mutateHate }: Props
{createdDate.slice(0, 10)}
-
❤️ 좋아요 {likeCount}
-
🖤 싫어요 {hateCount}
+ ❤️ 좋아요 {likeCount}{" "} + + 🖤 싫어요 {hateCount}{" "} +
답글쓰기
 @@ -76,9 +78,7 @@ function Comment({ comment, mutateDeleteComment, mutateLike, mutateHate }: Props }} /> - {toggleMenu && ( - - )} + {toggleMenu && } {toggleWarningModal && ( )} @@ -162,4 +162,10 @@ const Comma = styled.div` `} `; +const InteractionButton = styled.div` + :active { + transform: scale(1.15); + } +`; + export default Comment; From f08e1022f24d5e9a42597a563804ad961b575a4c Mon Sep 17 00:00:00 2001 From: leejiho9898 Date: Sun, 23 Jul 2023 03:05:54 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat=20=EC=84=A0=ED=83=9D=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EA=B8=80=20=EC=9E=91=EC=84=B1=EC=9E=90=20?= =?UTF-8?q?box=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/components/detail/VoteContainer.tsx | 2 + apps/web/components/detail/VoteWriterBox.tsx | 92 ++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 apps/web/components/detail/VoteWriterBox.tsx diff --git a/apps/web/components/detail/VoteContainer.tsx b/apps/web/components/detail/VoteContainer.tsx index cf2bcd9d..f6c43ce6 100644 --- a/apps/web/components/detail/VoteContainer.tsx +++ b/apps/web/components/detail/VoteContainer.tsx @@ -11,6 +11,7 @@ import DetailAB from "./DetailAB"; import FilterBar from "./FilterBar"; import useFilterStatistics from "./hooks/useFilterStatistics"; import VoteAnalyzeBar from "./VoteAnalyzeBar"; +import VoteWriterBox from "./VoteWriterBox"; function VoteContainer({ postId }: { postId: number }) { const [isModifyModal, onToggleModifyModal] = useToggle(false); @@ -57,6 +58,7 @@ function VoteContainer({ postId }: { postId: number }) { return ( <> + { + const { nickName, userAge, userGender, userImage, userMbti } = writer; + return ( + + 댓글 프로필 + + + + {userGender} + {userAge} + {userMbti} + + + {nickName} + + + ); +}; + +const Container = styled.div` + display: flex; + justify-content: flex-start; + gap: 8px; + position: relative; + padding-bottom: 14px; +`; + +const NickName = styled.div` + font-weight: 700; + ${({ theme }) => css` + color: ${theme.palette.ink.darker}; + ${theme.textStyle.Font_Regular} + `} +`; + +const Flex = styled.div` + display: flex; + align-items: center; + gap: 6px; +`; + +const DivideTag = styled.div` + width: 1px; + height: 8px; + margin: 0 4px; + ${({ theme }) => css` + background-color: ${theme.palette.background.selected}; + `} +`; + +const TagBox = styled.div` + display: flex; + align-items: center; + padding: 3px 4px; + width: auto; + ${({ theme }) => css` + background-color: ${theme.palette.background.soft}; + color: ${theme.palette.ink.base}; + ${theme.textStyle.Font_Minimum} + `} +`; + +const ContentsBox = styled.div` + display: flex; + flex-direction: column; + flex: 1 1 auto; +`; + +export default VoteWriterBox; From 2259f980232b8a19a6dad75ce709e7fb912062ad Mon Sep 17 00:00:00 2001 From: leejiho9898 Date: Sun, 23 Jul 2023 03:23:03 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat=20=ED=86=B5=EA=B3=84=EB=B0=94=20?= =?UTF-8?q?=EC=A2=8C=20=EC=9A=B0=EC=B8=A1=EC=97=90=20AB=EA=B8=80=EC=94=A8?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/components/detail/VoteAnalyzeBar.tsx | 25 +++++++++++++++++- apps/web/public/icons/Dark-A.png | Bin 0 -> 272 bytes apps/web/public/icons/Dark-B.png | Bin 0 -> 302 bytes apps/web/public/icons/Light-A.png | Bin 0 -> 255 bytes apps/web/public/icons/Light-B.png | Bin 0 -> 287 bytes apps/web/public/icons/index.ts | 4 +++ 6 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 apps/web/public/icons/Dark-A.png create mode 100644 apps/web/public/icons/Dark-B.png create mode 100644 apps/web/public/icons/Light-A.png create mode 100644 apps/web/public/icons/Light-B.png diff --git a/apps/web/components/detail/VoteAnalyzeBar.tsx b/apps/web/components/detail/VoteAnalyzeBar.tsx index 4fe94b76..96671e80 100644 --- a/apps/web/components/detail/VoteAnalyzeBar.tsx +++ b/apps/web/components/detail/VoteAnalyzeBar.tsx @@ -1,6 +1,7 @@ +import Image from "next/image"; +import { DarkAString, DarkBString, LightBString } from "public/icons"; import React from "react"; import styled, { css } from "styled-components"; -import { AorB } from "types/vote"; interface Props { percentageA: number; @@ -22,10 +23,32 @@ function VoteAnalyzeBar({ percentageA, percentageB, totalCountA, totalCountB }: ) : ( + {isSelectedA && ( + A + )} {percentageA}%  
{totalCountA.toLocaleString()}명
 + {!isSelectedA && ( + A + )} {percentageB}%  
{totalCountB.toLocaleString()}명
 diff --git a/apps/web/public/icons/Dark-A.png b/apps/web/public/icons/Dark-A.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea822ed40b3138a25b025757d848ad923459ae4 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^20(1X!3HE14p{yHQk(@Ik;M!QI^H16xYTyqN}wQP zage(c!@6@aFM%AEbVpxD28NCO+5F~Wthdd zC1dSfWASTYo^#Ki$XnY{@v9|+?E=pNkb-Ts2P}&#a{Il@tW(#>hHR>FGGT^FT3-{J rRlM*2%lH?k)m>ml!DT@LxxX9uzbsUG6c(-y@+pI-tDnm{r-UW|{BB_1 literal 0 HcmV?d00001 diff --git a/apps/web/public/icons/Dark-B.png b/apps/web/public/icons/Dark-B.png new file mode 100644 index 0000000000000000000000000000000000000000..8f0d028c75e9d070c9be7352f801bc74ae819072 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^20(1f!3HE>&v_LIq&N#aB8wRqbi6^BajEUJl|Vtp z;vjb?hIQv;UIIBR>5jgR3=A9lx&I`x0{MqMT^vIy7~fvo$lGin;(BpDM__tOkC>Lr zbU_J4-H@JXfn+`KwDT|H Y|5J)ypT0l62lNhur>mdKI;Vst0EL-!761SM literal 0 HcmV?d00001 diff --git a/apps/web/public/icons/Light-A.png b/apps/web/public/icons/Light-A.png new file mode 100644 index 0000000000000000000000000000000000000000..8dfce58119848f340066319fc94c3fbbfc265a1b GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^20(1X!3HE14p{yHQk(@Ik;M!QI^H16xYTyqN}wQP zage(c!@6@aFM%AEbVpxD28NCO+Dol@vvVzl^&h2nQ`g?&jLvYe6|P;P-}hAM@b dmiwcD-A+j?H239~XF&Hcc)I$ztaD0e0s!%VSzrJF literal 0 HcmV?d00001 diff --git a/apps/web/public/icons/Light-B.png b/apps/web/public/icons/Light-B.png new file mode 100644 index 0000000000000000000000000000000000000000..7dff061ae7397ecf20fe0709a72ade4eccbdbd4e GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^20(1f!3HE>&v_LIq&N#aB8wRqbi6^BajEUJl|Vtp z;vjb?hIQv;UIIBR>5jgR3=A9lx&I`x0{L4!T^vIy7~kFq?nuakaXA`rg2wm zWy$QHoEJe{R{IpqhFTae_Jy{&hv QfbM7TboFyt=akR{00*mUU;qFB literal 0 HcmV?d00001 diff --git a/apps/web/public/icons/index.ts b/apps/web/public/icons/index.ts index f70e2d6d..6ed5131a 100644 --- a/apps/web/public/icons/index.ts +++ b/apps/web/public/icons/index.ts @@ -21,3 +21,7 @@ export { default as AlertIcon } from "./AlertIcon.png"; export { default as MoreIcon } from "./MoreIcon.png"; export { default as MyPageIcon } from "./MyPageIcon.png"; export { default as Back } from "./Back.png"; +export { default as LightAString } from "./Light-A.png"; +export { default as DarkAString } from "./Dark-A.png"; +export { default as LightBString } from "./Light-B.png"; +export { default as DarkBString } from "./Dark-B.png"; From 51ed199c29af1dd0bc87730f53c5ea894ea92331 Mon Sep 17 00:00:00 2001 From: leejiho9898 Date: Sat, 29 Jul 2023 00:41:21 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=EC=BB=A8=EB=B2=A4=EC=85=98=EC=97=90?= =?UTF-8?q?=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/components/detail/VoteWriterBox.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/components/detail/VoteWriterBox.tsx b/apps/web/components/detail/VoteWriterBox.tsx index ac20da07..39fb85ee 100644 --- a/apps/web/components/detail/VoteWriterBox.tsx +++ b/apps/web/components/detail/VoteWriterBox.tsx @@ -13,7 +13,7 @@ interface Props { }; } -const VoteWriterBox = ({ writer }: Props) => { +function VoteWriterBox({ writer }: Props) { const { nickName, userAge, userGender, userImage, userMbti } = writer; return ( @@ -38,7 +38,7 @@ const VoteWriterBox = ({ writer }: Props) => { ); -}; +} const Container = styled.div` display: flex;