From 424ee85086b8a8965a54fc00f2360ddd7d701130 Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 00:26:18 +0900 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=EC=83=81=ED=95=98=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A1=A4=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GiftHome/common/GiftHomeShowcase.styled.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/GiftHome/common/GiftHomeShowcase.styled.ts b/src/components/GiftHome/common/GiftHomeShowcase.styled.ts index 778f881d..931b58aa 100644 --- a/src/components/GiftHome/common/GiftHomeShowcase.styled.ts +++ b/src/components/GiftHome/common/GiftHomeShowcase.styled.ts @@ -22,7 +22,6 @@ export const NoGiftsWrapper = styled.div` export const GiftsWrapper = styled.div` width: 36rem; - height: 22.5rem; display: flex; column-gap: 0.8rem; From b698468fc5bb490ab9843c474765c93201574f77 Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 01:33:16 +0900 Subject: [PATCH 02/13] =?UTF-8?q?fix:=20=EB=AC=B8=EB=B2=95=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/GlobalStyle.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/style/GlobalStyle.ts b/src/style/GlobalStyle.ts index 3babbce8..95471b23 100644 --- a/src/style/GlobalStyle.ts +++ b/src/style/GlobalStyle.ts @@ -18,17 +18,15 @@ ${reset} } :root { - --vh: 100% + --vh: 100%; } - html { - over-flow-x : hidden; -} -body { - over-flow-x : hidden; -} + + html, body{ + overflow-x : hidden; + } + #root, body, html { scrollbar-width: none; /* 파이어폭스 스크롤바 숨김 */ - margin: 0 auto; padding:0; font-size: 62.5%; From e9447784890877fa2a17d01e3c09771f687628e9 Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 01:42:44 +0900 Subject: [PATCH 03/13] =?UTF-8?q?fix:=20=EC=8A=A4=ED=81=AC=EB=A1=A4?= =?UTF-8?q?=EB=B0=94=20=EC=88=A8=EA=B8=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GiftHome/common/GiftHomeShowcase.styled.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/GiftHome/common/GiftHomeShowcase.styled.ts b/src/components/GiftHome/common/GiftHomeShowcase.styled.ts index 931b58aa..4a938722 100644 --- a/src/components/GiftHome/common/GiftHomeShowcase.styled.ts +++ b/src/components/GiftHome/common/GiftHomeShowcase.styled.ts @@ -30,4 +30,8 @@ export const GiftsWrapper = styled.div` color: ${({ theme }) => theme.colors.G_07}; ${({ theme }) => theme.fonts.body_09}; + + &::-webkit-scrollbar { + display: none; + } `; From 27aa5db14a6c99e9e979f06866c0baace581283b Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 01:42:58 +0900 Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=EA=B0=84=EA=B2=A9=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GiftHome/common/GiftHomeShowcaseItem.styled.ts | 3 +++ .../common/GiftHome/Price/GiftHomePriceTag.style.ts | 2 ++ src/components/common/GiftHome/Price/GiftHomePriceTag.tsx | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/GiftHome/common/GiftHomeShowcaseItem.styled.ts b/src/components/GiftHome/common/GiftHomeShowcaseItem.styled.ts index 7c07c4b8..ae2ba26c 100644 --- a/src/components/GiftHome/common/GiftHomeShowcaseItem.styled.ts +++ b/src/components/GiftHome/common/GiftHomeShowcaseItem.styled.ts @@ -22,6 +22,8 @@ export const GiftsItemImage = styled.img` `; export const GiftsItemTitle = styled.p` + margin-top: 0.8rem; + display: -webkit-box; width: 12.8rem; -webkit-box-orient: vertical; @@ -35,6 +37,7 @@ export const GiftsItemTitle = styled.p` `; export const GiftsItemPrice = styled.span` + margin-top: 0.2rem; ${({ theme }) => theme.fonts.body_09}; color: ${({ theme }) => theme.colors.black}; `; diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts index a574f01c..2dc30eb6 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts @@ -1,5 +1,7 @@ import styled from 'styled-components'; export const Price = styled.p<{ $fonts: string }>` + display: flex; + column-gap: 0.2rem; ${({ theme, $fonts }) => `${theme}.fonts.${$fonts}`}; `; diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx index 5ea92536..a8144a7d 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx @@ -11,7 +11,12 @@ const GiftHomePriceTag: React.FC = ({ price, fonts }) => { return price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); }; - return {formatPrice(price)}원; + return ( + + {formatPrice(price)} + 원 + + ); }; GiftHomePriceTag.propTypes = { From 83c3e91fd8ac5f4a0450ed5bb10c44b98206f53a Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 02:17:04 +0900 Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GiftAddButtons/GiftAddButtonsWrapper.tsx | 2 +- .../GiftHomeMyGifts/GiftHomeMyGiftsItem.style.ts | 14 +++++++++++++- .../GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx | 2 +- .../GiftHoeShowcaseHeader.style.ts | 2 +- .../GiftHome/Price/GiftHomePriceTag.style.ts | 5 +++-- .../common/GiftHome/Price/GiftHomePriceTag.tsx | 6 ++++-- .../GiftHomeMyGifts/GiftHomeMyGifts.style.ts | 1 + 7 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/components/GiftAdd/GiftAddButtons/GiftAddButtonsWrapper.tsx b/src/components/GiftAdd/GiftAddButtons/GiftAddButtonsWrapper.tsx index 1cee8dff..26cbdba4 100644 --- a/src/components/GiftAdd/GiftAddButtons/GiftAddButtonsWrapper.tsx +++ b/src/components/GiftAdd/GiftAddButtons/GiftAddButtonsWrapper.tsx @@ -36,7 +36,7 @@ const GiftAddButtonsWrapper = ({ data, onCancelClick }: GiftAddButtonsProps) => {data.name} - + ); diff --git a/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.style.ts b/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.style.ts index 1d23dc22..01808b4e 100644 --- a/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.style.ts +++ b/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.style.ts @@ -2,10 +2,10 @@ import styled from 'styled-components'; export const GiftHomeMyGifts = styled.div` display: flex; - align-items: center; margin-bottom: 1.2rem; height: 7rem; + img { width: 7rem; height: 7rem; @@ -14,13 +14,25 @@ export const GiftHomeMyGifts = styled.div` } `; +export const GiftHomeMygiftsImg = styled.img` + height: 7rem; + width: 7rem; + object-fit: cover; +`; + export const InfoWrapper = styled.div` display: flex; flex-direction: column; + margin-left: 1.6rem; + margin-top: 1.2rem; `; export const Title = styled.p` + width: 24.9rem; + height: 2.1rem; + margin-bottom: 0.4rem; + display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; diff --git a/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx b/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx index aafcfb44..5e71f55e 100644 --- a/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx +++ b/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx @@ -10,7 +10,7 @@ interface GiftHomeMyGiftsItemProps { const GiftHomeMyGiftsItem: React.FC = ({ name, cost, imageUrl }) => { return ( - + {name} diff --git a/src/components/GiftHome/common/GiftHomeShowcaseHeader/GiftHoeShowcaseHeader.style.ts b/src/components/GiftHome/common/GiftHomeShowcaseHeader/GiftHoeShowcaseHeader.style.ts index 4199cb6f..6a756c88 100644 --- a/src/components/GiftHome/common/GiftHomeShowcaseHeader/GiftHoeShowcaseHeader.style.ts +++ b/src/components/GiftHome/common/GiftHomeShowcaseHeader/GiftHoeShowcaseHeader.style.ts @@ -4,7 +4,7 @@ export const GiftHomeShowcaseHeaderWrapper = styled.article` width: 100%; height: 4rem; padding: 0 1.4rem 0 0; - margin-bottom: 0.7rem; + margin-bottom: 0.6rem; display: flex; justify-content: space-between; align-items: center; diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts index 2dc30eb6..95a95072 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts @@ -1,7 +1,8 @@ import styled from 'styled-components'; -export const Price = styled.p<{ $fonts: string }>` +export const Price = styled.p<{ $fonts: string; $colors: string; $gap: number }>` display: flex; - column-gap: 0.2rem; + column-gap: ${({ $gap }) => $gap}; ${({ theme, $fonts }) => `${theme}.fonts.${$fonts}`}; + color: ${({ theme, $colors }) => `${theme}.colors.${$colors}`}; `; diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx index a8144a7d..4f9d788d 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx @@ -4,15 +4,17 @@ import { Price } from './GiftHomePriceTag.style'; interface PriceTagProps { price: number; fonts: string; + colors: string; + gap: number; } -const GiftHomePriceTag: React.FC = ({ price, fonts }) => { +const GiftHomePriceTag: React.FC = ({ price, fonts, colors, gap }) => { const formatPrice = (price: number) => { return price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); }; return ( - + {formatPrice(price)} 원 diff --git a/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts b/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts index 20a4fd9e..19d81e55 100644 --- a/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts +++ b/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts @@ -8,5 +8,6 @@ export const GiftHomeMyGiftsWrapper = styled.article` `; export const GiftsWrapper = styled.div` + height: 7rem; gap: 1.7rem; `; From fdb2a3c3b768dbab67926a77f4e4c72f56c4b10d Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:31:22 +0900 Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx | 4 ++-- .../GiftHome/GiftHomeSummary/GiftHomeSummary.styled.ts | 2 +- .../common/GiftHome/Price/GiftHomePriceTag.style.ts | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx b/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx index 5e71f55e..6488743c 100644 --- a/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx +++ b/src/components/GiftHome/GiftHomeMyGifts/GiftHomeMyGiftsItem.tsx @@ -1,4 +1,4 @@ -import PriceTag from '../../common/title/Price/PriceTag'; +import GiftHomePriceTag from '../../common/GiftHome/Price/GiftHomePriceTag'; import * as S from './GiftHomeMyGiftsItem.style'; interface GiftHomeMyGiftsItemProps { @@ -13,7 +13,7 @@ const GiftHomeMyGiftsItem: React.FC = ({ name, cost, i {name} - + ); diff --git a/src/components/GiftHome/GiftHomeSummary/GiftHomeSummary.styled.ts b/src/components/GiftHome/GiftHomeSummary/GiftHomeSummary.styled.ts index c060a43c..6decf04c 100644 --- a/src/components/GiftHome/GiftHomeSummary/GiftHomeSummary.styled.ts +++ b/src/components/GiftHome/GiftHomeSummary/GiftHomeSummary.styled.ts @@ -14,7 +14,7 @@ export const GiftHomeSummaryWrapper = styled.section` background-image: url(${HomeBackgroundImage}); background-size: cover; background-repeat: no-repeat; - width: calc(100% + 1.4rem); + /* width: calc(100% + 1.4rem); */ `; export const FriendsNumber = styled.p` diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts index 95a95072..1c62b26b 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts @@ -2,7 +2,9 @@ import styled from 'styled-components'; export const Price = styled.p<{ $fonts: string; $colors: string; $gap: number }>` display: flex; - column-gap: ${({ $gap }) => $gap}; - ${({ theme, $fonts }) => `${theme}.fonts.${$fonts}`}; - color: ${({ theme, $colors }) => `${theme}.colors.${$colors}`}; + column-gap: ${({ $gap }) => $gap}px; /* Ensure unit for column-gap */ + ${({ theme, $fonts, $colors }) => ` + ${theme.fonts[$fonts]}; + color: ${theme.colors[$colors]}; + `} `; From 821ce98bbe0c4ebb0e3cc251d04a9d033379e8a3 Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:43:04 +0900 Subject: [PATCH 07/13] =?UTF-8?q?style:=20gap=20=ED=86=B5=EC=9D=BC=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GiftHome/GiftHome2030Gifts/GiftHome2030Item.tsx | 2 +- .../GiftHome/GiftHomeFriendsGifts/GiftHomeFriendsItem.tsx | 2 +- src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts | 2 +- src/pages/GiftHomeDetail/GiftHomeDetail.tsx | 2 +- src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/GiftHome/GiftHome2030Gifts/GiftHome2030Item.tsx b/src/components/GiftHome/GiftHome2030Gifts/GiftHome2030Item.tsx index 378af93b..c5b9781d 100644 --- a/src/components/GiftHome/GiftHome2030Gifts/GiftHome2030Item.tsx +++ b/src/components/GiftHome/GiftHome2030Gifts/GiftHome2030Item.tsx @@ -14,7 +14,7 @@ const GiftHome2030Item = ({ imgUrl, title, price, url }: GiftHome2030ItemProps) {title} - + ); diff --git a/src/components/GiftHome/GiftHomeFriendsGifts/GiftHomeFriendsItem.tsx b/src/components/GiftHome/GiftHomeFriendsGifts/GiftHomeFriendsItem.tsx index a0685285..85b49ae9 100644 --- a/src/components/GiftHome/GiftHomeFriendsGifts/GiftHomeFriendsItem.tsx +++ b/src/components/GiftHome/GiftHomeFriendsGifts/GiftHomeFriendsItem.tsx @@ -15,7 +15,7 @@ const GiftHomeFriendsItem = ({ imgUrl, title, price, user, url }: GiftHomeFriend {title} - + {user} diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts index 1c62b26b..7951d783 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.style.ts @@ -2,7 +2,7 @@ import styled from 'styled-components'; export const Price = styled.p<{ $fonts: string; $colors: string; $gap: number }>` display: flex; - column-gap: ${({ $gap }) => $gap}px; /* Ensure unit for column-gap */ + column-gap: ${({ $gap }) => $gap}rem; ${({ theme, $fonts, $colors }) => ` ${theme.fonts[$fonts]}; color: ${theme.colors[$colors]}; diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail.tsx b/src/pages/GiftHomeDetail/GiftHomeDetail.tsx index 8e644142..198114aa 100644 --- a/src/pages/GiftHomeDetail/GiftHomeDetail.tsx +++ b/src/pages/GiftHomeDetail/GiftHomeDetail.tsx @@ -24,7 +24,7 @@ export const GiftHomeDetail = () => { {item.name} - + )) diff --git a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx index d797c1c4..88a66e14 100644 --- a/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx +++ b/src/pages/GiftHomeDetail/GiftHomeDetailFriends.tsx @@ -26,7 +26,7 @@ function GiftHomeDetailFriends() { window.open(item.url)}> {item.name} - + )) ) : ( From b40efc1e3b65554974a58c52a3a2057efe71fafb Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:03:35 +0900 Subject: [PATCH 08/13] =?UTF-8?q?style:=20=ED=96=84=EB=B2=84=EA=B1=B0=20?= =?UTF-8?q?=EB=B0=94=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/GiftDetail/GiftDetailHeader.style.ts | 15 +++++++++++++-- .../common/GiftDetail/GiftDetailHeader.tsx | 9 +-------- src/pages/GiftHomeDetail/GiftHomeDetail.styled.ts | 2 ++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/components/common/GiftDetail/GiftDetailHeader.style.ts b/src/components/common/GiftDetail/GiftDetailHeader.style.ts index 3929da24..b1f0f0e5 100644 --- a/src/components/common/GiftDetail/GiftDetailHeader.style.ts +++ b/src/components/common/GiftDetail/GiftDetailHeader.style.ts @@ -1,13 +1,24 @@ import styled from 'styled-components'; +import { IcLeft } from '../../../assets/svg'; export const GiftDetailHeaderWrapper = styled.article` - width: 100%; + width: 37.5rem; height: 5.6rem; margin-bottom: 0.8rem; display: flex; - justify-content: space-between; + justify-content: center; align-items: center; ${({ theme }) => theme.fonts.body_01}; `; +export const IcLeftSvg = styled(IcLeft)` + position: absolute; + left: 0.6rem; + width: 3.6rem; + height: 3.6rem; + top: 1rem; + + cursor: pointer; + ${({ theme }) => theme.fonts.body_01}; +`; diff --git a/src/components/common/GiftDetail/GiftDetailHeader.tsx b/src/components/common/GiftDetail/GiftDetailHeader.tsx index c4d1691f..d7a5ba38 100644 --- a/src/components/common/GiftDetail/GiftDetailHeader.tsx +++ b/src/components/common/GiftDetail/GiftDetailHeader.tsx @@ -1,11 +1,9 @@ import { useNavigate } from 'react-router-dom'; -import { IcLeft, IcMenu } from '../../../assets/svg'; import * as S from './GiftDetailHeader.style'; interface GiftDetailHeaderProps { title: string; roomId: string; - // targetDate: string; } const GiftDetailHeader = ({ title, roomId }: GiftDetailHeaderProps) => { @@ -13,17 +11,12 @@ const GiftDetailHeader = ({ title, roomId }: GiftDetailHeaderProps) => { const handleClickBtn = () => { navigate(`/gift-home/${roomId}`); - // navigate(-1); }; return ( - + {title} - ); }; diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail.styled.ts b/src/pages/GiftHomeDetail/GiftHomeDetail.styled.ts index e23725d4..abe7ea79 100644 --- a/src/pages/GiftHomeDetail/GiftHomeDetail.styled.ts +++ b/src/pages/GiftHomeDetail/GiftHomeDetail.styled.ts @@ -40,6 +40,8 @@ export const GiftsItemImage = styled.img` `; export const GiftsItemTitle = styled.p` + margin-top: 0.8rem; + display: -webkit-box; width: 12.8rem; -webkit-box-orient: vertical; From 1bab066f736f7835e1cc1c45e2cc26e2666f0363 Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:16:38 +0900 Subject: [PATCH 09/13] =?UTF-8?q?style:=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts b/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts index 19d81e55..e033a89b 100644 --- a/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts +++ b/src/pages/GiftHome/GiftHomeMyGifts/GiftHomeMyGifts.style.ts @@ -2,12 +2,12 @@ import styled from 'styled-components'; export const GiftHomeMyGiftsWrapper = styled.article` width: 100%; + margin-bottom: 1.8rem; padding: 0.6rem 0.5rem 0 2rem; `; export const GiftsWrapper = styled.div` - height: 7rem; gap: 1.7rem; `; From e5a813fdc9cf9b2769fa1d0721c3222bbb0c0b39 Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:39:34 +0900 Subject: [PATCH 10/13] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/GiftHome/Price/GiftHomePriceTag.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx index 4f9d788d..2bbf52d9 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx @@ -8,7 +8,12 @@ interface PriceTagProps { gap: number; } -const GiftHomePriceTag: React.FC = ({ price, fonts, colors, gap }) => { +const GiftHomePriceTag: React.FC = ({ + price, + fonts, + colors, + gap, +}: PriceTagProps) => { const formatPrice = (price: number) => { return price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); }; From 93be9419ac3ea7b7034417872ffcacc8e26e904f Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:44:56 +0900 Subject: [PATCH 11/13] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/GiftHomeDetail/GiftHomeDetail.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail.tsx b/src/pages/GiftHomeDetail/GiftHomeDetail.tsx index 198114aa..a50f01e8 100644 --- a/src/pages/GiftHomeDetail/GiftHomeDetail.tsx +++ b/src/pages/GiftHomeDetail/GiftHomeDetail.tsx @@ -24,7 +24,7 @@ export const GiftHomeDetail = () => { {item.name} - + )) From 2f3c4d0271af18104f197ed71829890e6b7621bd Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:50:05 +0900 Subject: [PATCH 12/13] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/GiftHome/Price/GiftHomePriceTag.tsx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx index 2bbf52d9..9f96f0b4 100644 --- a/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx +++ b/src/components/common/GiftHome/Price/GiftHomePriceTag.tsx @@ -1,4 +1,3 @@ -import PropTypes from 'prop-types'; import { Price } from './GiftHomePriceTag.style'; interface PriceTagProps { @@ -8,12 +7,7 @@ interface PriceTagProps { gap: number; } -const GiftHomePriceTag: React.FC = ({ - price, - fonts, - colors, - gap, -}: PriceTagProps) => { +const GiftHomePriceTag = ({ price, fonts, colors, gap }: PriceTagProps) => { const formatPrice = (price: number) => { return price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); }; @@ -26,8 +20,4 @@ const GiftHomePriceTag: React.FC = ({ ); }; -GiftHomePriceTag.propTypes = { - price: PropTypes.number.isRequired, -}; - export default GiftHomePriceTag; From 53dba1592b64131f6c4e6631735a4a8ea52def1b Mon Sep 17 00:00:00 2001 From: urjimyu <92876819+urjimyu@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:58:21 +0900 Subject: [PATCH 13/13] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx index 226e8e71..c1a8a691 100644 --- a/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx +++ b/src/pages/GiftHomeDetail/GiftHomeDetail2030.tsx @@ -24,7 +24,7 @@ function GiftHomeDetail() { {item.name} - + ))