From fba1833f54fb0a7335ede94273571cf947b80f82 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Tue, 8 Jul 2025 19:47:52 +0900 Subject: [PATCH 01/22] =?UTF-8?q?design:=20=EB=B0=98=EC=9D=91=ED=98=95=20?= =?UTF-8?q?=EB=AA=A8=EC=84=9C=EB=A6=AC=20radius=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/recommend/_components/RecommendationPanel/index.tsx | 2 +- src/app/recommend/page.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/recommend/_components/RecommendationPanel/index.tsx b/src/app/recommend/_components/RecommendationPanel/index.tsx index 47f5c67..b5cfed7 100644 --- a/src/app/recommend/_components/RecommendationPanel/index.tsx +++ b/src/app/recommend/_components/RecommendationPanel/index.tsx @@ -7,7 +7,7 @@ export default function RecommendationPanel({ spaceData: RecommendationResponse[]; }) { return ( -
+

diff --git a/src/app/recommend/page.tsx b/src/app/recommend/page.tsx index 942a5b5..3a8cc9c 100644 --- a/src/app/recommend/page.tsx +++ b/src/app/recommend/page.tsx @@ -17,7 +17,7 @@ export default function RecommendPage() { if (error) return
{error}
; return ( -
+
From cfd1372e73d86c1bacbafa00d2497a7acf05d9d6 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Tue, 8 Jul 2025 21:20:39 +0900 Subject: [PATCH 02/22] =?UTF-8?q?feat:=20=EC=B6=94=EC=B2=9C=20=ED=8C=A8?= =?UTF-8?q?=EB=84=90=EA=B3=BC=20=EC=A7=80=EB=8F=84=20=EB=AA=A8=EB=91=90=20?= =?UTF-8?q?=EC=A1=B0=EC=9E=91=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/recommend/_components/NavBar.tsx | 2 +- src/app/recommend/_components/RecommendationPanel/index.tsx | 2 +- src/app/recommend/page.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/recommend/_components/NavBar.tsx b/src/app/recommend/_components/NavBar.tsx index e232f99..563dbc0 100644 --- a/src/app/recommend/_components/NavBar.tsx +++ b/src/app/recommend/_components/NavBar.tsx @@ -5,7 +5,7 @@ import LogoKR from "@/assets/icons/logo_kr.png"; export default function NavBar() { return ( -
+
+

diff --git a/src/app/recommend/page.tsx b/src/app/recommend/page.tsx index 3a8cc9c..a25bf22 100644 --- a/src/app/recommend/page.tsx +++ b/src/app/recommend/page.tsx @@ -21,14 +21,14 @@ export default function RecommendPage() {
-
+
{/* 임시 버튼 */} -
+
From 3dd87d8f0651d4a1409749479292f63bf89fa9ad Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Tue, 8 Jul 2025 21:58:27 +0900 Subject: [PATCH 03/22] =?UTF-8?q?chore:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/next.config.ts b/next.config.ts index ecfa0b1..be5be4d 100644 --- a/next.config.ts +++ b/next.config.ts @@ -6,6 +6,7 @@ const nextConfig = { "www.gunsan.go.kr", "www.ktriptips.com", "www.saemangeum.go.kr", + "www.sdco.or.kr", ], }, }; From f3da947461dde8224568f556ad5331e6a45da210 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Tue, 8 Jul 2025 22:29:03 +0900 Subject: [PATCH 04/22] =?UTF-8?q?design:=20PC=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=B6=94=EC=B2=9C=20=ED=8C=A8=EB=84=90=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/recommend/_components/MapView/index.tsx | 2 +- src/app/recommend/_components/RecommendationPanel/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/recommend/_components/MapView/index.tsx b/src/app/recommend/_components/MapView/index.tsx index 078c18b..4871bfa 100644 --- a/src/app/recommend/_components/MapView/index.tsx +++ b/src/app/recommend/_components/MapView/index.tsx @@ -12,7 +12,7 @@ export default function MapView() {
Hello World!
diff --git a/src/app/recommend/_components/RecommendationPanel/index.tsx b/src/app/recommend/_components/RecommendationPanel/index.tsx index 353da9a..454a565 100644 --- a/src/app/recommend/_components/RecommendationPanel/index.tsx +++ b/src/app/recommend/_components/RecommendationPanel/index.tsx @@ -7,7 +7,7 @@ export default function RecommendationPanel({ spaceData: RecommendationResponse[]; }) { return ( -
+

From d4406b454ebe84d02fdfedd327288980f68f90e0 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Wed, 9 Jul 2025 09:32:08 +0900 Subject: [PATCH 05/22] =?UTF-8?q?feat:=20=EC=A7=80=EB=8F=84=EC=97=90=20?= =?UTF-8?q?=EB=A7=88=EC=BB=A4=20=EB=B0=8F=20=EA=B2=BD=EB=A1=9C=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recommend/_components/MapView/index.tsx | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/app/recommend/_components/MapView/index.tsx b/src/app/recommend/_components/MapView/index.tsx index 4871bfa..0f7aa89 100644 --- a/src/app/recommend/_components/MapView/index.tsx +++ b/src/app/recommend/_components/MapView/index.tsx @@ -1,6 +1,6 @@ "use client"; -import { Map, MapMarker, useKakaoLoader } from "react-kakao-maps-sdk"; +import { Map, MapMarker, Polyline, useKakaoLoader } from "react-kakao-maps-sdk"; export default function MapView() { const [loading, error] = useKakaoLoader({ @@ -11,12 +11,31 @@ export default function MapView() { return ( - -
Hello World!
+ +
새만금 국가산업단지
 + +
중간
+ + +
도착
+ + ); } From 221d4dccb3a1e29191fcf38b18e35d33761a1526 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Wed, 9 Jul 2025 12:27:12 +0900 Subject: [PATCH 06/22] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=EA=B0=80=20=EC=84=A0=ED=83=9D=ED=95=9C=20=EA=B1=B0=EC=A3=BC=20?= =?UTF-8?q?=EC=9D=98=ED=96=A5=20=EC=A7=80=EC=97=AD=EC=9D=84=20=EB=8F=84?= =?UTF-8?q?=EC=B0=A9=20=EC=A7=80=EC=A0=90=EC=9C=BC=EB=A1=9C=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EB=A7=88=EC=BB=A4=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?=20&=20=EC=8B=9C=EC=9E=91=20=EC=A7=80=EC=A0=90=EA=B3=BC=20?= =?UTF-8?q?=EC=A4=91=EA=B0=84=20=EC=A7=80=EC=A0=90=EC=9D=98=20=EC=A4=91?= =?UTF-8?q?=EA=B0=84=20=EC=A7=80=EC=A0=90=EC=9D=84=20=EC=B4=88=EA=B8=B0=20?= =?UTF-8?q?=EC=A4=91=EC=8B=AC=EC=A2=8C=ED=91=9C=EB=A1=9C=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/icons/marker.svg | 3 + .../recommend/_components/MapView/index.tsx | 59 +++++++++++-------- src/constants/spaceData.ts | 7 +++ src/utils/getDestination.ts | 24 ++++++++ src/utils/getMidpoint.ts | 14 +++++ 5 files changed, 81 insertions(+), 26 deletions(-) create mode 100644 public/icons/marker.svg create mode 100644 src/utils/getDestination.ts create mode 100644 src/utils/getMidpoint.ts diff --git a/public/icons/marker.svg b/public/icons/marker.svg new file mode 100644 index 0000000..536bd1e --- /dev/null +++ b/public/icons/marker.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/recommend/_components/MapView/index.tsx b/src/app/recommend/_components/MapView/index.tsx index 0f7aa89..ef6e570 100644 --- a/src/app/recommend/_components/MapView/index.tsx +++ b/src/app/recommend/_components/MapView/index.tsx @@ -1,41 +1,48 @@ "use client"; -import { Map, MapMarker, Polyline, useKakaoLoader } from "react-kakao-maps-sdk"; +import { Map, MapMarker, useKakaoLoader } from "react-kakao-maps-sdk"; +import { COORDINATE } from "@/constants/spaceData"; +import { getMidpoint } from "@/utils/getMidpoint"; +import { getDestination } from "@/utils/getDestination"; export default function MapView() { const [loading, error] = useKakaoLoader({ appkey: process.env.NEXT_PUBLIC_APPKEY!, }); + if (loading) return
Loading
; if (error) return
Error
; + + const origin = COORDINATE.SAEMANGEUM; + const destination = getDestination(); + const midpoint = getMidpoint(origin, destination); + return ( - - -
새만금 국가산업단지
- - + + + + +
중간
 - -
도착
- - ); } diff --git a/src/constants/spaceData.ts b/src/constants/spaceData.ts index 47d0e2f..2f59212 100644 --- a/src/constants/spaceData.ts +++ b/src/constants/spaceData.ts @@ -4,3 +4,10 @@ export const CATEGORY = { TOUR: "여행", CULTURE: "문화", }; + +export const COORDINATE = { + SAEMANGEUM: { lat: 35.946862602735365, lng: 126.58619832722653 }, // 새만금 국가산업단지 + GUNSAN: { lat: 35.967459350903326, lng: 126.73683995707835 }, // 군산 시청 + GIMJE: { lat: 35.80356634577659, lng: 126.88064626048931 }, // 김제 시청 + BUAN: { lat: 35.731655977706986, lng: 126.73300580105003 }, // 부안 군청 +}; diff --git a/src/utils/getDestination.ts b/src/utils/getDestination.ts new file mode 100644 index 0000000..a4cb9d5 --- /dev/null +++ b/src/utils/getDestination.ts @@ -0,0 +1,24 @@ +import { COORDINATE } from "@/constants/spaceData"; + +export function getDestination() { + const onboarding = JSON.parse( + localStorage.getItem("onboardingAnswers") ?? "[]" + ); + const preferredRegion = onboarding[3]; + + switch (preferredRegion) { + case "군산": + return COORDINATE.GUNSAN; + case "김제": + return COORDINATE.GIMJE; + case "부안": + return COORDINATE.BUAN; + case "새만금": + case "아직 없어요!": { + const options = [COORDINATE.GUNSAN, COORDINATE.GIMJE, COORDINATE.BUAN]; + return options[Math.floor(Math.random() * options.length)]; + } + default: + return COORDINATE.SAEMANGEUM; + } +} diff --git a/src/utils/getMidpoint.ts b/src/utils/getMidpoint.ts new file mode 100644 index 0000000..96f7d05 --- /dev/null +++ b/src/utils/getMidpoint.ts @@ -0,0 +1,14 @@ +export interface Coordinate { + lat: number; + lng: number; +} + +export function getMidpoint( + coord1: Coordinate, + coord2: Coordinate +): Coordinate { + return { + lat: (coord1.lat + coord2.lat) / 2, + lng: (coord1.lng + coord2.lng) / 2, + }; +} From 89708a4dfefd3f8b83b893c5b163bc333a8de84c Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Wed, 9 Jul 2025 12:52:44 +0900 Subject: [PATCH 07/22] =?UTF-8?q?design:=20=EC=A7=80=EB=8F=84=EA=B0=80=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=20=ED=8C=A8=EB=84=90=EC=9D=98=20?= =?UTF-8?q?=EA=B3=B5=EA=B0=84=EC=9D=84=20=EC=A0=9C=EC=99=B8=ED=95=98?= =?UTF-8?q?=EA=B3=A0=20=EA=BD=89=20=EC=B1=84=EC=9A=B8=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/recommend/page.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/recommend/page.tsx b/src/app/recommend/page.tsx index a25bf22..0904e67 100644 --- a/src/app/recommend/page.tsx +++ b/src/app/recommend/page.tsx @@ -18,8 +18,10 @@ export default function RecommendPage() { return (
-
- +
+
+ +
From 60e094dcae30afedc7dec3f64b1b6e15effa2d71 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Wed, 9 Jul 2025 14:26:49 +0900 Subject: [PATCH 08/22] =?UTF-8?q?feat:=20=EC=B6=94=EC=B2=9C=20=EC=9E=A5?= =?UTF-8?q?=EC=86=8C=20=EC=BB=A4=EC=8A=A4=ED=85=80=20=EB=A7=88=EC=BB=A4=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/icons/marker_recommendation.svg | 30 +++++++++++++++ .../MapView/RecommendationMarker.tsx | 38 +++++++++++++++++++ .../recommend/_components/MapView/index.tsx | 20 +++++++--- src/app/recommend/page.tsx | 2 +- 4 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 public/icons/marker_recommendation.svg create mode 100644 src/app/recommend/_components/MapView/RecommendationMarker.tsx diff --git a/public/icons/marker_recommendation.svg b/public/icons/marker_recommendation.svg new file mode 100644 index 0000000..654bcde --- /dev/null +++ b/public/icons/marker_recommendation.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/recommend/_components/MapView/RecommendationMarker.tsx b/src/app/recommend/_components/MapView/RecommendationMarker.tsx new file mode 100644 index 0000000..030c292 --- /dev/null +++ b/src/app/recommend/_components/MapView/RecommendationMarker.tsx @@ -0,0 +1,38 @@ +import { CustomOverlayMap, MapMarker } from "react-kakao-maps-sdk"; +import { Coordinate } from "@/utils/getMidpoint"; +import Image from "next/image"; + +interface RecommendationMarkerProps { + position: Coordinate; +} + +export default function RecommendationMarker({ + position, +}: RecommendationMarkerProps) { + return ( + <> + + +
+
+ +
+
+ + + ); +} diff --git a/src/app/recommend/_components/MapView/index.tsx b/src/app/recommend/_components/MapView/index.tsx index ef6e570..36409c0 100644 --- a/src/app/recommend/_components/MapView/index.tsx +++ b/src/app/recommend/_components/MapView/index.tsx @@ -1,11 +1,17 @@ "use client"; import { Map, MapMarker, useKakaoLoader } from "react-kakao-maps-sdk"; +import { RecommendationResponse } from "@/lib/type"; import { COORDINATE } from "@/constants/spaceData"; import { getMidpoint } from "@/utils/getMidpoint"; import { getDestination } from "@/utils/getDestination"; +import RecommendationMarker from "./RecommendationMarker"; -export default function MapView() { +export default function MapView({ + spaceData, +}: { + spaceData: RecommendationResponse[]; +}) { const [loading, error] = useKakaoLoader({ appkey: process.env.NEXT_PUBLIC_APPKEY!, }); @@ -18,7 +24,11 @@ export default function MapView() { const midpoint = getMidpoint(origin, destination); return ( - + + {/* 추천 지점 마커 */} + + + {/* 시작 지점 마커 */} + + {/* 도착 지점 마커 */} - - -
중간
- ); } diff --git a/src/app/recommend/page.tsx b/src/app/recommend/page.tsx index 0904e67..0966d7f 100644 --- a/src/app/recommend/page.tsx +++ b/src/app/recommend/page.tsx @@ -20,7 +20,7 @@ export default function RecommendPage() {
- +
From 9faeb64e7a1c86bf7e8cccdb219b6e770d693085 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Wed, 9 Jul 2025 14:44:51 +0900 Subject: [PATCH 09/22] =?UTF-8?q?feat:=20=EA=B2=BD=EB=A1=9C=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/recommend/_components/MapView/index.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/app/recommend/_components/MapView/index.tsx b/src/app/recommend/_components/MapView/index.tsx index 36409c0..55f4bae 100644 --- a/src/app/recommend/_components/MapView/index.tsx +++ b/src/app/recommend/_components/MapView/index.tsx @@ -1,6 +1,6 @@ "use client"; -import { Map, MapMarker, useKakaoLoader } from "react-kakao-maps-sdk"; +import { Map, MapMarker, Polyline, useKakaoLoader } from "react-kakao-maps-sdk"; import { RecommendationResponse } from "@/lib/type"; import { COORDINATE } from "@/constants/spaceData"; import { getMidpoint } from "@/utils/getMidpoint"; @@ -51,6 +51,15 @@ export default function MapView({ }, }} /> + + {/* 경로 */} + ); } From 3b3e0e81780655db822b74468cbf94caaf375bc4 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Wed, 9 Jul 2025 15:01:25 +0900 Subject: [PATCH 10/22] =?UTF-8?q?design:=20=EB=84=A4=EB=B9=84=EA=B2=8C?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EB=B0=94=20=EB=A1=9C=EA=B3=A0=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {src/assets/icons => public/logo}/logo_dev.png | Bin {src/assets/icons => public/logo}/logo_kr.png | Bin public/logo/logo_simple.svg | 9 +++++++++ src/app/_components/LandingPage/index.tsx | 3 +-- src/app/recommend/_components/NavBar.tsx | 16 ++++++---------- src/assets/icons/logo.png | Bin 15171 -> 0 bytes 6 files changed, 16 insertions(+), 12 deletions(-) rename {src/assets/icons => public/logo}/logo_dev.png (100%) rename {src/assets/icons => public/logo}/logo_kr.png (100%) create mode 100644 public/logo/logo_simple.svg delete mode 100644 src/assets/icons/logo.png diff --git a/src/assets/icons/logo_dev.png b/public/logo/logo_dev.png similarity index 100% rename from src/assets/icons/logo_dev.png rename to public/logo/logo_dev.png diff --git a/src/assets/icons/logo_kr.png b/public/logo/logo_kr.png similarity index 100% rename from src/assets/icons/logo_kr.png rename to public/logo/logo_kr.png diff --git a/public/logo/logo_simple.svg b/public/logo/logo_simple.svg new file mode 100644 index 0000000..542ae30 --- /dev/null +++ b/public/logo/logo_simple.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/app/_components/LandingPage/index.tsx b/src/app/_components/LandingPage/index.tsx index 72be1ab..4598552 100644 --- a/src/app/_components/LandingPage/index.tsx +++ b/src/app/_components/LandingPage/index.tsx @@ -3,7 +3,6 @@ import { useEffect } from "react"; import { createNewUser } from "@/utils/createNewUser"; import Image from "next/image"; -import Logo from "@/assets/icons/logo.png"; export default function LandingPage({ routing, @@ -20,7 +19,7 @@ export default function LandingPage({ return (
- +

새길에 오신 것을 환영해요! diff --git a/src/app/recommend/_components/NavBar.tsx b/src/app/recommend/_components/NavBar.tsx index 563dbc0..8fa3c92 100644 --- a/src/app/recommend/_components/NavBar.tsx +++ b/src/app/recommend/_components/NavBar.tsx @@ -1,18 +1,14 @@ import Image from "next/image"; -import Logo from "@/assets/icons/logo.png"; -import LogoDev from "@/assets/icons/logo_dev.png"; -import LogoKR from "@/assets/icons/logo_kr.png"; +import Logo from "../../../../public/logo/logo_simple.svg"; +import LogoDev from "../../../../public/logo/logo_dev.png"; +import LogoKR from "../../../../public/logo/logo_kr.png"; export default function NavBar() { return ( -
- 새길 로고 +
+ 새길 로고
- 새만금 개발청 + 새만금 개발청 새만금 사업단
diff --git a/src/assets/icons/logo.png b/src/assets/icons/logo.png deleted file mode 100644 index efc8295b36abfcfada15eb20a33949639cff102f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15171 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 IV!Z From 88d0c93f207d73e5a1165d9670ef2f1c79f3ff54 Mon Sep 17 00:00:00 2001 From: hyeonjiroh Date: Wed, 9 Jul 2025 16:47:56 +0900 Subject: [PATCH 11/22] =?UTF-8?q?design:=20=ED=94=8C=EB=A1=9C=ED=8C=85=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/_components/SurveyScreen/index.tsx | 10 +++++++--- .../_components/RetrySurveyButton.tsx | 7 +++---- .../_components/SatisfactionModalButton.tsx | 8 ++++++-- src/app/recommend/page.tsx | 4 +--- src/components/Button/index.tsx | 20 ++++++++----------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/app/_components/SurveyScreen/index.tsx b/src/app/_components/SurveyScreen/index.tsx index 8610953..85257e2 100644 --- a/src/app/_components/SurveyScreen/index.tsx +++ b/src/app/_components/SurveyScreen/index.tsx @@ -45,14 +45,18 @@ export default function SurveyScreen({ type, routing }: SurveyScreenProps) {
{currentQuestion > 0 && ( - )} ); } diff --git a/src/app/recommend/_components/SatisfactionModalButton.tsx b/src/app/recommend/_components/SatisfactionModalButton.tsx index 93e9a46..23bc1f5 100644 --- a/src/app/recommend/_components/SatisfactionModalButton.tsx +++ b/src/app/recommend/_components/SatisfactionModalButton.tsx @@ -2,8 +2,12 @@ import Button from "@/components/Button"; export default function SatisfactionModalButton() { return ( - ); } diff --git a/src/app/recommend/page.tsx b/src/app/recommend/page.tsx index 0966d7f..f9724b9 100644 --- a/src/app/recommend/page.tsx +++ b/src/app/recommend/page.tsx @@ -28,9 +28,7 @@ export default function RecommendPage() {
- - {/* 임시 버튼 */} -
+
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx index 2971b15..2728db7 100644 --- a/src/components/Button/index.tsx +++ b/src/components/Button/index.tsx @@ -4,33 +4,29 @@ import { ReactNode } from "react"; import clsx from "clsx"; interface ButtonProps { - variant: "primary" | "secondary"; - style?: "filled" | "outlined"; - width?: number; + color: "blue" | "gray" | "white"; onClick?: () => void; + className?: string; disabled?: boolean; children: ReactNode; } export default function Button({ - variant = "primary", - style = "filled", - width = 120, + color = "blue", onClick, disabled = false, + className = "", children, }: ButtonProps) { return (