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", ], }, }; diff --git a/public/icons/marker_destination.svg b/public/icons/marker_destination.svg new file mode 100644 index 0000000..90cdde9 --- /dev/null +++ b/public/icons/marker_destination.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/icons/marker_origin.svg b/public/icons/marker_origin.svg new file mode 100644 index 0000000..223d0e6 --- /dev/null +++ b/public/icons/marker_origin.svg @@ -0,0 +1,4 @@ + + + + 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/public/illusts/commute_recommendation.png b/public/illusts/commute_recommendation.png new file mode 100644 index 0000000..d144b3f Binary files /dev/null and b/public/illusts/commute_recommendation.png differ diff --git a/public/illusts/mood_finder.png b/public/illusts/mood_finder.png new file mode 100644 index 0000000..7ccef91 Binary files /dev/null and b/public/illusts/mood_finder.png differ diff --git a/public/logo/logo.svg b/public/logo/logo.svg new file mode 100644 index 0000000..bdf33ef --- /dev/null +++ b/public/logo/logo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + 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 3216831..a3c07b9 100644 --- a/src/app/_components/LandingPage/index.tsx +++ b/src/app/_components/LandingPage/index.tsx @@ -2,10 +2,10 @@ import { useEffect } from "react"; import { createNewUser } from "@/utils/createNewUser"; +import { Info } from "lucide-react"; import Image from "next/image"; import Button from "@/components/Button"; -import Logo from "@/assets/icons/logo.png"; -import { Info } from "lucide-react"; +import Logo from "../../../../public/logo/logo.svg"; export default function LandingPage({ routing, @@ -17,42 +17,55 @@ export default function LandingPage({ }, []); return ( -
-
- logo -
-

- 새길에 오신 것을
환영해요! -

-
-
- - -
-
-

- 본 서비스는 새만금사업 보조 목적의 정주의향 확인 및 인구유입 가능성을 확인하는 설문조사입니다. -

-

- 설문조사 응답은 오로지 새만금 관련 신규데이터 생산에만 쓰이며,
+

+
+ 새길 로고 +
+

+ 새길에 오신 것을 환영해요! +

+
+
+
+ +
+

+ 본 서비스는 새만금사업 보조 목적의 정주의향 확인 및 인구유입 + 가능성을 확인하는 설문조사입니다. +
+
+ 설문조사 응답은 오로지 새만금 관련 신규데이터 생산에만 쓰이며, +
민감한 개인정보는 수집 대상이 아님을 밝힙니다.

+

+ 귀중한 시간을 내주셔서 감사드리며, +
편안하고 진솔하게 답해주시길 바랍니다. +

- -

- 귀중한 시간을 내주셔서 감사드리며,
편안하고 진솔하게 답해주시길 바랍니다. -

-

+

+
+
+
+

먼저 간단한 정보부터 시작해볼까요?

- -

- 기타 서비스 관련 문의사항 | chickentasty0112@gmail.com -

+

+ 기타 서비스 관련 문의사항 | chickentasty0112@gmail.com +

); 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 942a5b5..62ec0c7 100644 --- a/src/app/recommend/page.tsx +++ b/src/app/recommend/page.tsx @@ -17,18 +17,18 @@ export default function RecommendPage() { if (error) return
{error}
; return ( -
-
- +
+
+
+ +
-
+
- - {/* 임시 버튼 */} -
+
diff --git a/src/assets/icons/location.svg b/src/assets/icons/location.svg deleted file mode 100644 index 29f9c97..0000000 --- a/src/assets/icons/location.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/assets/icons/logo.png b/src/assets/icons/logo.png deleted file mode 100644 index efc8295..0000000 Binary files a/src/assets/icons/logo.png and /dev/null differ diff --git a/src/assets/icons/reading.png b/src/assets/icons/reading.png deleted file mode 100644 index d3c8e93..0000000 Binary files a/src/assets/icons/reading.png and /dev/null differ diff --git a/src/assets/icons/walk.png b/src/assets/icons/walk.png deleted file mode 100644 index 619a09d..0000000 Binary files a/src/assets/icons/walk.png and /dev/null differ 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 (