Merge remote-tracking branch 'origin/main'

Author: daun-up

src/pages/ResultPage/index.tsx

@@ -1,11 +1,23 @@
 // 코디 추천 결과랑 가상피팅 결과를 조건문 써서 2개 렌더링하기
-import React, {useEffect, useState} from 'react';
+import React, { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import {ShowResultBox, Result, DateText, InfoBoldText, InfoNormalText, InfoContainer, InfoWrapper, Line, ReviewWrapper, WriteReviewBox, ReviewButton} from './style';
+import {
+  ShowResultBox,
+  Result,
+  DateText,
+  InfoBoldText,
+  InfoNormalText,
+  InfoContainer,
+  InfoWrapper,
+  Line,
+  ReviewWrapper,
+  WriteReviewBox,
+  ReviewButton,
+} from './style';
 import Header from '../../components/Header';
 import ClickButton from '../../components/Button/ClickButton';
-import {privateAxiosInstance} from "../../apis/axiosInstance";
-import { ReactComponent as Spinner } from '../../assets/spin.svg'
+import { privateAxiosInstance } from '../../apis/axiosInstance';
+import { ReactComponent as Spinner } from '../../assets/spin.svg';
 
 interface Clothes {
   id: number;
@@ -35,7 +47,7 @@ interface ApiData {
   review?: Review;
 }
 
-const ShowResult: React.FC= () => {
+const ShowResult: React.FC = () => {
   const searchParams = new URLSearchParams(window.location.search);
   const id = parseInt(searchParams.get('id') || '1', 10); // 기본값 1 , 십진수로 받아올 것//isVirtualFitting 값 가져오기
   const navigate = useNavigate();
@@ -48,18 +60,18 @@ const ShowResult: React.FC= () => {
     if (id) {
       privateAxiosInstance
         .get(`/history/${id}`)
-        .then((response) => {
+        .then(response => {
           if (response.data) {
             setData(response.data);
             setLoading(false);
 
             if (response.data.history.type) {
               const type = response.data.history.type;
-              setIsVirtualFitting((type === 'FITTING'));
+              setIsVirtualFitting(type === 'FITTING');
             }
           }
         })
-        .catch((err) => {
+        .catch(err => {
           setError('데이터를 가져오는데 실패했습니다.');
           console.error('데이터를 가져오는데 실패했습니다:', err);
           setLoading(false);
@@ -72,7 +84,14 @@ const ShowResult: React.FC= () => {
 
   if (loading) {
     return (
-      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}>
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+          height: '100vh',
+        }}
+      >
         <Spinner />
       </div>
     );
@@ -112,7 +131,21 @@ const ShowResult: React.FC= () => {
     <ShowResultBox>
       <Header text={isVirtualFitting ? '가상 피팅 결과' : '코디 추천 결과'} />
       <Result>
-        <img src={data.history.fittingImageURL || data.history.clothesList[0]?.imagePath} width={432} alt="result"
+        <img
+          src={
+            data.history.fittingImageURL ||
+            data.history.clothesList[0]?.imagePath
+          }
+          width={432}
+          alt="result"
+        />
+        <img
+          src={
+            data.history.fittingImageURL ||
+            data.history.clothesList[1]?.imagePath
+          }
+          width={432}
+          alt="result2"
         />
       </Result>
       <InfoWrapper>
@@ -125,19 +158,23 @@ const ShowResult: React.FC= () => {
       <ReviewWrapper>
         <WriteReviewBox>
           <InfoBoldText>리뷰</InfoBoldText>
-          {(!data.review || (data.review.text === '')) && (
-            <ReviewButton onClick={handleClickButton}>리뷰 남기러 가기{'>'}</ReviewButton>
+          {(!data.review || data.review.text === '') && (
+            <ReviewButton onClick={handleClickButton}>
+              리뷰 남기러 가기{'>'}
+            </ReviewButton>
           )}
         </WriteReviewBox>
         <InfoNormalText>
-          {(data.review && data.review.text !== '') ? data.review.text : '아직 리뷰를 남기지 않았어요!'}
+          {data.review && data.review.text !== ''
+            ? data.review.text
+            : '아직 리뷰를 남기지 않았어요!'}
         </InfoNormalText>
       </ReviewWrapper>
-    {!isVirtualFitting && (
-    <ClickButton variant='footerButton' onClick={handleClick}>
-      가상 피팅 하러 가기
-    </ClickButton>
-    )}
+      {!isVirtualFitting && (
+        <ClickButton variant="footerButton" onClick={handleClick}>
+          가상 피팅 하러 가기
+        </ClickButton>
+      )}
     </ShowResultBox>
   );
 };