Merge pull request #108 from SOPT-all/develop

merge to main
SOPT-all · Nov 29, 2024 · c2f5f36 · c2f5f36
2 parents c627fd8 + 79c1e24
commit c2f5f36
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/src/assets/images/img_banner_reward.png b/src/assets/images/img_banner_reward.png
diff --git a/src/components/ProductInfo/ProductInfoStyle.ts b/src/components/ProductInfo/ProductInfoStyle.ts
@@ -10,6 +10,7 @@ export const productInfoContainerStyle = css`
 
 export const proudctImgLayoutStyle = css`
 	display: flex;
+	gap: 1.3rem;
 	width: 43.1rem;
 	height: 36.8rem;
 `;
@@ -30,7 +31,7 @@ export const productImgStyle = css`
 export const productDetailLayoutStyle = css`
 	display: flex;
 	flex-direction: column;
-	gap: 1.6rem;
+	gap: 1.5rem;
 	width: 50.9rem;
 	height: 39.7rem;
 `;
@@ -179,4 +180,3 @@ export const reivewBoxStyle = css`
 	align-items: center;
 	height: 2rem;
 `;
-
diff --git a/src/components/orderDetail/productRecommend/productRecommendStyle.ts b/src/components/orderDetail/productRecommend/productRecommendStyle.ts
@@ -22,7 +22,7 @@ export const productListContainer = css`
 	display: flex;
 	justify-content: space-between;
 	width: 86.5rem;
-	height: 33rem;
+	height: 34rem;
 	padding: 0 1.3rem;
 	overflow: hidden;
 `;

diff --git a/src/components/product/ProductCardStyle.ts b/src/components/product/ProductCardStyle.ts
@@ -8,6 +8,10 @@ export const productContainer = (theme: Theme, width: string, hoverLarge: boolea
 	background-color: ${theme.colors.white};
 	border-radius: ${hoverLarge ? '12px' : '16px'};
 
+	transition:
+		transform 0.2s ease-in-out,
+		box-shadow 0.2s ease-in-out;
+
 	&:hover {
 		z-index: 1;
 
@@ -18,7 +22,6 @@ export const productContainer = (theme: Theme, width: string, hoverLarge: boolea
 		${hoverLarge
 			? `
             transform: scale(1.13, 1.065);
-            transform-origin: top center; /* 상단의 시작 지점을 고정 */
             border-radius: 16px;
             `
 			: `

diff --git a/src/components/productSummary/ProductSummay.tsx b/src/components/productSummary/ProductSummay.tsx
@@ -34,15 +34,15 @@ const ProductSummay = () => (
 				</p>
 				<p css={textStyle}>
 					<IcAskBlack20 />
-					제품의 총 전력이 67W인지 궁금합니다.
+					해당 제품은 발열이 어느 정도 발생하나요? 또 휴대성이 편리한지 알고 싶어여.
 				</p>
 			</div>
 		</section>
 		<section css={agencyServiceInfoLayoutStyle}>
 			<h1 css={titleStyle}>구매대행 서비스 안내</h1>
 			<p css={textStyle}>
 				<IcHandshakeGray20 />
-				해당 제품은 구매대행을 통하여 유통되는 제품입니다.「전기용품 및 생활용품 안전관리법」에 따라 안전관리대상
+				해당 제품은 구매대행을 통하여 유통되는 제품입니다. 「전기용품 및 생활용품 안전관리법」에 따라 안전관리대상
 				제품으로 분류됩니다.
 			</p>
 		</section>

diff --git a/src/constants/dummyProductResponse.ts b/src/constants/dummyProductResponse.ts
@@ -2,16 +2,16 @@ const dummyProductResponse = {
 	success: true,
 	data: {
 		productId: 1,
-		productImage: 'https://ae01.alicdn.com/kf/S709d4d4778ea430c87c0bf0a6574fa8dz.jpg_220x220q75.jpg_.webp',
+		productImage: 'https://github.com/user-attachments/assets/b9e6d9e9-d5f6-4250-bfeb-fe58cadf02ae',
 		detail:
-			'Toocki C타입 to C타입 케이블, 100W PD 고속 충전 충전기, USB C to USB C 디스플레이 케이블, 샤오미 POCO F3 리얼미 맥북 아이패드용',
-		priceOriginal: 6812,
-		percent: 60,
-		priceDiscount: 2700,
+			'Toocki GaN USB C 충전기, 맥쿡 아이폰 15, 14, 13, 12 프로 맥스, 삼성, 샤오미 포코용, 멀티 컬러, 고속 충전, 67W',
+		priceOriginal: 17955,
+		percent: 66,
+		priceDiscount: 6070,
 		isCoupon: true,
 		categoryName: 'Electronics',
-		reviewCount: 8,
-		rating: 3.25,
+		reviewCount: 9,
+		rating: 3.1,
 	},
 	error: null,
 };