From 9d71c82faba3ab4cdc9ee96a7501af3ee4321d35 Mon Sep 17 00:00:00 2001 From: hae-on Date: Sat, 20 Jul 2024 14:34:32 +0900 Subject: [PATCH 1/9] =?UTF-8?q?refactor:=20gap=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Recipe/RecipeFavoriteButton/recipeFavoriteButton.css.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Recipe/RecipeFavoriteButton/recipeFavoriteButton.css.ts b/src/components/Recipe/RecipeFavoriteButton/recipeFavoriteButton.css.ts index 5f56bc18..02ed8b06 100644 --- a/src/components/Recipe/RecipeFavoriteButton/recipeFavoriteButton.css.ts +++ b/src/components/Recipe/RecipeFavoriteButton/recipeFavoriteButton.css.ts @@ -3,5 +3,4 @@ import { style } from '@vanilla-extract/css'; export const container = style({ display: 'flex', alignItems: 'center', - gap: 6, }); From 63de063d9c9950072564abc5b12f28cc188b221a Mon Sep 17 00:00:00 2001 From: hae-on Date: Sun, 21 Jul 2024 00:35:59 +0900 Subject: [PATCH 2/9] =?UTF-8?q?refactor:=20=EC=A2=8B=EC=95=84=EC=9A=94=20?= =?UTF-8?q?=EC=B9=B4=EC=9A=B4=ED=8A=B8=20=EC=9E=88=EC=9D=84=20=EB=95=8C?= =?UTF-8?q?=EB=A7=8C=20=EA=B0=84=EA=B2=A9=20=EC=9E=88=EB=8F=84=EB=A1=9D=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 --- .../Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx b/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx index 7c55edea..4d0fd70f 100644 --- a/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx +++ b/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx @@ -34,6 +34,7 @@ const RecipeFavoriteButton = ({ recipeId, favorite, favoriteCount }: RecipeFavor )} + {favoriteCount &&
} {favoriteCount} From 9a4ff6e5c32ea0f3cf48961e0af502c1dd806d3d Mon Sep 17 00:00:00 2001 From: hae-on Date: Sun, 21 Jul 2024 00:41:24 +0900 Subject: [PATCH 3/9] =?UTF-8?q?refactor:=20textarea=20=EC=83=81=ED=95=98?= =?UTF-8?q?=EC=A2=8C=EC=9A=B0=20=EC=88=98=ED=8F=89=20=EB=A7=9E=EC=B6=94?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Recipe/CommentForm/commentForm.css.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Recipe/CommentForm/commentForm.css.ts b/src/components/Recipe/CommentForm/commentForm.css.ts index a2fb3b99..aac66421 100644 --- a/src/components/Recipe/CommentForm/commentForm.css.ts +++ b/src/components/Recipe/CommentForm/commentForm.css.ts @@ -11,9 +11,9 @@ export const container = style({ export const commentForm = style({ display: 'flex', gap: 8, - alignItems: 'flex-end', + alignItems: 'center', width: '100%', - padding: '6px 16px 9px 16px', + padding: '6px 16px 6px 16px', background: vars.colors.background.category, borderRadius: 20, }); From 425678718197e1fb12b7f542a37d65324c770b3e Mon Sep 17 00:00:00 2001 From: hae-on Date: Sun, 21 Jul 2024 01:19:28 +0900 Subject: [PATCH 4/9] =?UTF-8?q?refactor:=20=EA=BF=80=EC=A1=B0=ED=95=A9=20?= =?UTF-8?q?=ED=95=98=EB=82=98=EC=9D=BC=20=EB=95=8C=20=EC=BB=A4=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Product/ProductRecipeList/ProductRecipeList.tsx | 4 ++-- .../Product/ProductRecipeList/productRecipeList.css.ts | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/Product/ProductRecipeList/ProductRecipeList.tsx b/src/components/Product/ProductRecipeList/ProductRecipeList.tsx index 3c901d91..afdca5e3 100644 --- a/src/components/Product/ProductRecipeList/ProductRecipeList.tsx +++ b/src/components/Product/ProductRecipeList/ProductRecipeList.tsx @@ -1,6 +1,6 @@ import { Link } from 'react-router-dom'; -import { container, moreItem, notFound, recipeLink } from './productRecipeList.css'; +import { container, moreItem, notFound, recipeLink, wrapper } from './productRecipeList.css'; import SearchNotFoundImage from '@/assets/search-notfound.png'; import { Text, ShowAllButton } from '@/components/Common'; @@ -41,7 +41,7 @@ const ProductRecipeList = ({ productId, productName }: ProductRecipeListProps) = return (
    {recipeToDisplay.map((recipe) => ( -
  • +
    • ))} diff --git a/src/components/Product/ProductRecipeList/productRecipeList.css.ts b/src/components/Product/ProductRecipeList/productRecipeList.css.ts index dcb4e844..37c80ea4 100644 --- a/src/components/Product/ProductRecipeList/productRecipeList.css.ts +++ b/src/components/Product/ProductRecipeList/productRecipeList.css.ts @@ -8,6 +8,12 @@ export const container = style({ overflowX: 'auto', }); +export const wrapper = style({ + height: '100%', + display: 'flex', + flex: '0 0 160px', +}); + export const moreItem = style({ display: 'flex', justifyContent: 'center', From 67027bb2c8a658aacfac43e6fc17fce6689e4069 Mon Sep 17 00:00:00 2001 From: hae-on Date: Sun, 21 Jul 2024 01:22:58 +0900 Subject: [PATCH 5/9] =?UTF-8?q?refactor:=20=EA=B2=80=EC=83=89=EC=B0=BD=20?= =?UTF-8?q?=EA=BF=80=EC=A1=B0=ED=95=A9=20=EC=83=81=ED=92=88=20=ED=95=98?= =?UTF-8?q?=EB=82=98=EC=9D=BC=20=EB=95=8C=20=EC=BB=A4=EC=A7=80=EB=8A=94=20?= =?UTF-8?q?=ED=98=84=EC=83=81=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecipeSearchResultPreviewList.tsx | 6 +++--- .../recipeSearchResultPreviewList.css.ts | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/Search/RecipeSearchResultPreviewList/RecipeSearchResultPreviewList.tsx b/src/components/Search/RecipeSearchResultPreviewList/RecipeSearchResultPreviewList.tsx index b188fc6d..668e44bc 100644 --- a/src/components/Search/RecipeSearchResultPreviewList/RecipeSearchResultPreviewList.tsx +++ b/src/components/Search/RecipeSearchResultPreviewList/RecipeSearchResultPreviewList.tsx @@ -1,6 +1,6 @@ import { useRef } from 'react'; -import { listWrapper } from './recipeSearchResultPreviewList.css'; +import { container, wrapper } from './recipeSearchResultPreviewList.css'; import SearchNotFound from '../SearchNotFound/SearchNotFound'; import { ShowAllButton } from '@/components/Common'; @@ -26,9 +26,9 @@ const RecipeSearchResultPreviewList = ({ searchQuery }: RecipeSearchResultPrevie } return ( -
      +
        {displaySlice(false, recipes, 4).map((recipe, idx) => ( -
      • +
      • {idx < 4 ? ( ) : ( diff --git a/src/components/Search/RecipeSearchResultPreviewList/recipeSearchResultPreviewList.css.ts b/src/components/Search/RecipeSearchResultPreviewList/recipeSearchResultPreviewList.css.ts index df2e9d1a..a72d1e0c 100644 --- a/src/components/Search/RecipeSearchResultPreviewList/recipeSearchResultPreviewList.css.ts +++ b/src/components/Search/RecipeSearchResultPreviewList/recipeSearchResultPreviewList.css.ts @@ -1,8 +1,14 @@ import { style } from '@vanilla-extract/css'; -export const listWrapper = style({ +export const container = style({ display: 'flex', gap: 10, alignItems: 'center', overflowY: 'scroll', }); + +export const wrapper = style({ + height: '100%', + display: 'flex', + flex: '0 0 160px', +}); From 90f24d685b89f18d12c29bd37e0ac4cc7d8eed5c Mon Sep 17 00:00:00 2001 From: hae-on Date: Sun, 21 Jul 2024 01:35:21 +0900 Subject: [PATCH 6/9] =?UTF-8?q?refactor:=20border=20=EA=B0=92=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Product/ProductItem/productItem.css.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Product/ProductItem/productItem.css.ts b/src/components/Product/ProductItem/productItem.css.ts index 17701c41..3ee00e49 100644 --- a/src/components/Product/ProductItem/productItem.css.ts +++ b/src/components/Product/ProductItem/productItem.css.ts @@ -13,6 +13,7 @@ export const productImage = style({ width: '100%', height: 'auto', minWidth: 163, + borderRadius: '6px', objectFit: 'cover', aspectRatio: '1 / 1', }); From fd109ccec1e6f372203b42fef2ede6990d76caa7 Mon Sep 17 00:00:00 2001 From: hae-on Date: Sat, 27 Jul 2024 16:12:01 +0900 Subject: [PATCH 7/9] =?UTF-8?q?refactor:=20=ED=95=84=EC=9A=94=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EB=8B=A8=EC=9C=84=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Product/ProductItem/productItem.css.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Product/ProductItem/productItem.css.ts b/src/components/Product/ProductItem/productItem.css.ts index 3ee00e49..b1754519 100644 --- a/src/components/Product/ProductItem/productItem.css.ts +++ b/src/components/Product/ProductItem/productItem.css.ts @@ -13,7 +13,7 @@ export const productImage = style({ width: '100%', height: 'auto', minWidth: 163, - borderRadius: '6px', + borderRadius: 6, objectFit: 'cover', aspectRatio: '1 / 1', }); From d00f281a261235838ef3d2bec141351c9f8a3d59 Mon Sep 17 00:00:00 2001 From: hae-on Date: Sat, 27 Jul 2024 16:12:08 +0900 Subject: [PATCH 8/9] =?UTF-8?q?chore:=20=EC=A4=91=EB=B3=B5=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx b/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx index 524ecd7c..de77e477 100644 --- a/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx +++ b/src/components/Recipe/RecipeFavoriteButton/RecipeFavoriteButton.tsx @@ -47,10 +47,6 @@ const RecipeFavoriteButton = ({ recipeId, favorite, favoriteCount }: RecipeFavor
)} - {favoriteCount &&
} - - {favoriteCount} -
); }; From 7372294cc6679ab95dc5a232ebb576e82af11d9d Mon Sep 17 00:00:00 2001 From: hae-on Date: Wed, 31 Jul 2024 23:27:05 +0900 Subject: [PATCH 9/9] =?UTF-8?q?refactor:=20textarea=20=ED=99=95=EC=9E=A5?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=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 --- .../Recipe/CommentForm/CommentForm.tsx | 26 ++++++++++++------- .../Recipe/CommentForm/commentForm.css.ts | 16 ++++++++---- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/components/Recipe/CommentForm/CommentForm.tsx b/src/components/Recipe/CommentForm/CommentForm.tsx index 24fc6ffa..f33e341f 100644 --- a/src/components/Recipe/CommentForm/CommentForm.tsx +++ b/src/components/Recipe/CommentForm/CommentForm.tsx @@ -1,8 +1,8 @@ import { useToastActionContext } from '@fun-eat/design-system'; import type { ChangeEventHandler, FormEventHandler, RefObject } from 'react'; -import { useRef, useState } from 'react'; +import { useRef, useState, useEffect } from 'react'; -import { commentForm, commentTextarea, container, sendButton } from './commentForm.css'; +import { buttonWrapper, commentForm, commentTextarea, container, sendButton } from './commentForm.css'; import { SvgIcon, Text } from '@/components/Common'; import { MemberImage } from '@/components/Members'; @@ -65,26 +65,32 @@ const CommentForm = ({ recipeId, scrollTargetRef }: CommentFormProps) => { ); }; + useEffect(() => { + autoResizeTextarea(); + }, [commentValue]); + return (
- + <>