diff --git a/app/find-taste/page.tsx b/app/find-taste/page.tsx index b4f334c..5bbca39 100644 --- a/app/find-taste/page.tsx +++ b/app/find-taste/page.tsx @@ -5,11 +5,11 @@ import More from '@/components/matchingtest/More'; const Page = () => { return ( -
+ <>
-
+ ); }; diff --git a/app/find-taste/result/page.tsx b/app/find-taste/result/page.tsx index e97efcc..9948eb8 100644 --- a/app/find-taste/result/page.tsx +++ b/app/find-taste/result/page.tsx @@ -2,7 +2,7 @@ import UserStyle from '@/components/matchingtest/UserStyle'; import Similar from '@/components/matchingtest/Similar'; -import HomeNav from '@/components/home/HomeNav'; +import ResultNav from '@/components/matchingtest/ResultNav'; import Link from 'next/link'; import { useState } from 'react'; import ResultModal from '@/components/matchingtest/ResultModal'; @@ -89,36 +89,28 @@ const Page = ({ searchParams }: ResultPageProps) => { }; return (
-
- -
-
- -
-
- -
- -
-
- -
+ + + +
+
+ {isModalOpen && setModalOpen(false)} />}
); diff --git a/app/find-taste/test/page.tsx b/app/find-taste/test/page.tsx index e838d73..d4031fd 100644 --- a/app/find-taste/test/page.tsx +++ b/app/find-taste/test/page.tsx @@ -169,18 +169,14 @@ const Page = () => { return isLoading ? ( ) : ( -
-
- -
-
- slide.component)} - keys={slides.map((slide) => slide.name)} - swiperRef={swiperRef} - /> -
-
+ <> + + slide.component)} + keys={slides.map((slide) => slide.name)} + swiperRef={swiperRef} + /> + ); }; diff --git a/app/welcome/page.tsx b/app/welcome/page.tsx index 44d83ee..150f616 100644 --- a/app/welcome/page.tsx +++ b/app/welcome/page.tsx @@ -20,7 +20,7 @@ const page = () => { 향수에 입문해보아요 나에게 어울리는 향수 추천 받기 diff --git a/components/common/Footer.tsx b/components/common/Footer.tsx index 123515e..bd594fb 100644 --- a/components/common/Footer.tsx +++ b/components/common/Footer.tsx @@ -4,19 +4,29 @@ import Link from 'next/link'; const Footer = () => { return (
- - 향수제품추가요청 + + 향수 제품 추가 요청 - - 광고제휴문의 + + 광고 제휴 및 입점 문의
- - 이용약관 - - - 개인정보처리 + + 이용약관 + 개인정보 처리 방침
diff --git a/components/matchingtest/Header.tsx b/components/matchingtest/Header.tsx index ca0e689..a17017e 100644 --- a/components/matchingtest/Header.tsx +++ b/components/matchingtest/Header.tsx @@ -10,9 +10,12 @@ const Header = () => { router.back(); }; return ( -
- +
+
); }; + export default Header; diff --git a/components/matchingtest/Individuality.tsx b/components/matchingtest/Individuality.tsx index 044c47c..d615738 100644 --- a/components/matchingtest/Individuality.tsx +++ b/components/matchingtest/Individuality.tsx @@ -101,22 +101,22 @@ const Individuality = ({ updateSelection }: IndividualProps) => { const swiper = useSwiper(); return ( -
+
-
+
어떤 - - 개성적인 + + 개성적인 향 - 향을 + 을
원하시나요?
-
*2개 선택 필수
-
+
*2개 선택 필수
+
{options.map((option) => ( -
+
{ />
+
+ {options.slice(2, 4).map((option) => ( +
+
+ + +
+
+ ))} +
+
+ +
); }; diff --git a/components/matchingtest/SwiperHeader.tsx b/components/matchingtest/SwiperHeader.tsx index 3c962d8..cf74239 100644 --- a/components/matchingtest/SwiperHeader.tsx +++ b/components/matchingtest/SwiperHeader.tsx @@ -18,10 +18,10 @@ const SwiperHeader = ({ swiperRef }: SliderProps) => { } }; return ( -
-
- -
+
+
); }; diff --git a/components/matchingtest/Test.tsx b/components/matchingtest/Test.tsx index 5c67fce..2f0e2e2 100644 --- a/components/matchingtest/Test.tsx +++ b/components/matchingtest/Test.tsx @@ -3,7 +3,7 @@ import Link from 'next/link'; const Test = () => { return ( -
+
@@ -13,10 +13,12 @@ const Test = () => {
-
-
- 테스트시작 - +
+
+
+ 테스트시작 + +
diff --git a/components/matchingtest/UserStyle.tsx b/components/matchingtest/UserStyle.tsx index 21ef5c7..8a54e53 100644 --- a/components/matchingtest/UserStyle.tsx +++ b/components/matchingtest/UserStyle.tsx @@ -1,4 +1,17 @@ -import { SceneIcon, Testing } from '@/public/images'; +import { + SpicyGray, + WoodyGray, + CitrusGray, + ChypreGray, + AldehydeGray, + AromaticGray, + FloralGray, + LeatherGray, + GreenGray, + EarthyGray, + FruityGray, +} from '@/public/images'; +import Image from 'next/image'; interface Family { familyKorName: string; @@ -13,17 +26,75 @@ interface UserStyleProps { } const UserStyle = ({ families }: UserStyleProps) => { + const getImageComponent = (familyEngName: string) => { + let imageSrc: any; + switch (familyEngName) { + case 'WOODY': + imageSrc = WoodyGray; + break; + case 'SPICY': + imageSrc = SpicyGray; + break; + case 'CITRUS': + imageSrc = CitrusGray; + break; + case 'CHYPRE': + imageSrc = ChypreGray; + break; + case 'ALDEHYDE': + imageSrc = AldehydeGray; + break; + case 'AROMATIC': + imageSrc = AromaticGray; + break; + case 'FLORAL': + imageSrc = FloralGray; + break; + case 'LEATHER': + imageSrc = LeatherGray; + break; + case 'GREEN': + imageSrc = GreenGray; + break; + case 'EARTHY': + imageSrc = EarthyGray; + break; + case 'FRUITY': + imageSrc = FruityGray; + break; + default: + } + + return ( + {`${familyEngName} + ); + }; return ( -
+
- 당신에게 어울리는 계절코드 + 당신에게 어울리는 계열코드
{families.map((family) => (
- + badge
))}
@@ -32,8 +103,8 @@ const UserStyle = ({ families }: UserStyleProps) => { {families.map((family) => (
-
- +
+ {getImageComponent(family.familyEngName)}
@@ -43,7 +114,7 @@ const UserStyle = ({ families }: UserStyleProps) => {
-
{family.summary}
+
{family.summary}
{family.keyword.map((keywords) => (
diff --git a/components/matchingtest/Vibe.tsx b/components/matchingtest/Vibe.tsx index 3a01358..73a9780 100644 --- a/components/matchingtest/Vibe.tsx +++ b/components/matchingtest/Vibe.tsx @@ -53,14 +53,15 @@ const Vibe = ({ updateSelection, handleSubmit }: VibeProps) => { { id: '가벼운', label: '가벼운' }, ]; return ( -
+
-
향수로 어떤 분위기를
-
내고 싶으신가요?
+ 향수로 어떤 분위기를 +
+ 내고 싶으신가요?
-
*2개 선택 필수
-
+
*2개 선택 필수
+
{vibeOptions.map((option) => (
{ />