Merge pull request #36 from team-acode/develop

[hotfix] qa개선사항 수정
team-acode · Feb 1, 2024 · 0e21cc1 · 0e21cc1
2 parents dceae68 + 7e3759f
commit 0e21cc1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/find-taste/test/page.tsx b/app/find-taste/test/page.tsx
@@ -88,6 +88,7 @@ const Page = () => {
       name: 'individuality',
       component: (
         <Individuality
+          mainSelection={selections.main}
           updateSelection={(selection: string[]) =>
             updateSelections('individuality', selection)
           }

diff --git a/components/matchingtest/Individuality.tsx b/components/matchingtest/Individuality.tsx
@@ -3,9 +3,10 @@ import { useSwiper } from 'swiper/react';
 
 interface IndividualProps {
   updateSelection: (selection: string[]) => void;
+  mainSelection: string[];
 }
 
-const Individuality = ({ updateSelection }: IndividualProps) => {
+const Individuality = ({ updateSelection, mainSelection }: IndividualProps) => {
   const [selectedOptions, setSelectedOptions] = useState<string[]>([]);
 
   const handleCheckboxChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -105,10 +106,12 @@ const Individuality = ({ updateSelection }: IndividualProps) => {
       <div className="flex flex-col">
         <div className="h0 mb-[49px]">
           <div className="flex items-center">
-            어떤
-            <span className="h1 h-[34px]  bg-black ml-[8px] mr-[8px] text-white px-[14px] pt-[2px] rounded-sm">
-              개성적인 향
-            </span>
+            <span className="mr-[8px]">어떤</span>
+            {mainSelection.map((selection) => (
+              <span className="h1 h-[34px] bg-black mr-[8px] text-white px-[14px] pt-[2px] rounded-sm">
+                {selection}
+              </span>
+            ))}
             을
           </div>
           <div>원하시나요?</div>

diff --git a/components/matchingtest/Similar.tsx b/components/matchingtest/Similar.tsx
@@ -7,6 +7,7 @@ interface Fragrance {
   brandName: string;
   familyName: string;
   thumbnail: string;
+  concentration: string;
 }
 
 interface Style {
@@ -45,7 +46,7 @@ const Similar = ({ fragrance, style }: SimilarProps) => {
             />
             <div className="w-[134px] h-[35px] flex flex-col justify-center bg-white pl-[2px] mt-[10px]">
               <div className="text-acodegray-500 caption2 mb-1">
-                {perfume.brandName}
+                {perfume.brandName} · {perfume.concentration}
               </div>
               <div className="text-acodeblack similar-1 truncate">
                 {perfume.fragranceName}