diff --git a/next.config.mjs b/next.config.mjs new file mode 100644 index 0000000..abc270f --- /dev/null +++ b/next.config.mjs @@ -0,0 +1,55 @@ +/** @type {import('next').NextConfig} */ +const nextConfig = { + experimental: { + turbo: { + rules: { + "*.svg": { + loaders: ["@svgr/webpack"], + as: "*.js", + }, + }, + }, + }, + + webpack: (config) => { + const fileLoaderRule = config.module.rules.find((rule) => + rule.test?.test?.(".svg") + ); + + config.module.rules.push( + { + ...fileLoaderRule, + test: /\.svg$/i, + resourceQuery: /url/, + }, + { + test: /\.svg$/i, + issuer: fileLoaderRule.issuer, + resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] }, + use: [ + { + loader: "@svgr/webpack", + options: { + typescript: true, + ext: "tsx", + }, + }, + ], + } + ); + fileLoaderRule.exclude = /\.svg$/i; + return config; + }, + + images: { + domains: [ + "encrypted-tbn0.gstatic.com", + "www.gunsan.go.kr", + "www.ktriptips.com", + "www.saemangeum.go.kr", + "www.sdco.or.kr", + ], + }, +}; + +export default nextConfig; diff --git a/next.config.ts b/next.config.ts deleted file mode 100644 index be5be4d..0000000 --- a/next.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** @type {import('next').NextConfig} */ -const nextConfig = { - images: { - domains: [ - "encrypted-tbn0.gstatic.com", - "www.gunsan.go.kr", - "www.ktriptips.com", - "www.saemangeum.go.kr", - "www.sdco.or.kr", - ], - }, -}; - -export default nextConfig; diff --git a/package-lock.json b/package-lock.json index 8150feb..2859e62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2816,6 +2816,7 @@ "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-8.1.0.tgz", "integrity": "sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.21.3", "@babel/plugin-transform-react-constant-elements": "^7.21.3", diff --git a/public/icons/emoji_bad.svg b/public/icons/emoji_bad.svg new file mode 100644 index 0000000..c7033ba --- /dev/null +++ b/public/icons/emoji_bad.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/icons/emoji_excellent.svg b/public/icons/emoji_excellent.svg new file mode 100644 index 0000000..be06446 --- /dev/null +++ b/public/icons/emoji_excellent.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/icons/emoji_good.svg b/public/icons/emoji_good.svg new file mode 100644 index 0000000..359e7a1 --- /dev/null +++ b/public/icons/emoji_good.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/icons/emoji_neutral.svg b/public/icons/emoji_neutral.svg new file mode 100644 index 0000000..5a30ebd --- /dev/null +++ b/public/icons/emoji_neutral.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/public/icons/emoji_poor.svg b/public/icons/emoji_poor.svg new file mode 100644 index 0000000..868fb4c --- /dev/null +++ b/public/icons/emoji_poor.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/icons/marker_recommendation.svg b/public/icons/marker_recommendation.svg index 654bcde..466e834 100644 --- a/public/icons/marker_recommendation.svg +++ b/public/icons/marker_recommendation.svg @@ -25,6 +25,5 @@ - diff --git a/public/illusts/commute_recommendation.png b/public/images/commute_recommendation.png similarity index 100% rename from public/illusts/commute_recommendation.png rename to public/images/commute_recommendation.png diff --git a/public/illusts/mood_finder.png b/public/images/mood_finder.png similarity index 100% rename from public/illusts/mood_finder.png rename to public/images/mood_finder.png diff --git a/src/assets/icons/temp.jpg b/public/images/temp.jpg similarity index 100% rename from src/assets/icons/temp.jpg rename to public/images/temp.jpg diff --git a/public/logo/logo.svg b/public/logo/logo.svg index bdf33ef..2918b36 100644 --- a/public/logo/logo.svg +++ b/public/logo/logo.svg @@ -1,4 +1,4 @@ - + diff --git a/public/logo/logo_simple.svg b/public/logo/logo_simple.svg index 542ae30..e43586b 100644 --- a/public/logo/logo_simple.svg +++ b/public/logo/logo_simple.svg @@ -1,4 +1,4 @@ - + diff --git a/src/app/_components/LandingPage/index.tsx b/src/app/_components/LandingPage/index.tsx index a3c07b9..ece2b88 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 { Info } from "lucide-react"; -import Image from "next/image"; import Button from "@/components/Button"; import Logo from "../../../../public/logo/logo.svg"; @@ -19,8 +18,7 @@ export default function LandingPage({ return (
- 새길 로고 @@ -30,8 +28,8 @@ export default function LandingPage({
-
- +
+

본 서비스는 새만금사업 보조 목적의 정주의향 확인 및 인구유입 diff --git a/src/app/_components/SurveyScreen/SurveyOption.tsx b/src/app/_components/SurveyScreen/SurveyOption.tsx index f4b448c..9ccba66 100644 --- a/src/app/_components/SurveyScreen/SurveyOption.tsx +++ b/src/app/_components/SurveyScreen/SurveyOption.tsx @@ -1,7 +1,5 @@ import clsx from "clsx"; -import Image from "next/image"; -import checkDefault from "@/assets/icons/check_default.svg"; -import checkActive from "@/assets/icons/check_active.svg"; +import { Check } from "lucide-react"; interface SurveyOptionProps { text: string; @@ -30,7 +28,7 @@ export default function SurveyOption({ > {text}

- +
); } diff --git a/src/app/favicon.ico b/src/app/favicon.ico index 718d6fe..98dd97a 100644 Binary files a/src/app/favicon.ico and b/src/app/favicon.ico differ diff --git a/src/app/map/page.tsx b/src/app/map/page.tsx index d62dbab..db528b1 100644 --- a/src/app/map/page.tsx +++ b/src/app/map/page.tsx @@ -1,25 +1,14 @@ "use client"; -import { Map, MapMarker, useKakaoLoader } from "react-kakao-maps-sdk"; +import Bad from "../../../public/icons/emoji_bad.svg"; +import Image from "next/image"; -export default function KakaoMap() { - const [loading, error] = useKakaoLoader({ - appkey: process.env.NEXT_PUBLIC_APPKEY!, - }); - if (loading) return
Loading
; - if (error) return
Error
; +export default function MapPage() { return ( - <> +
테스트 페이지
- - -
Hello World!
- - - + + +
); } diff --git a/src/app/recommend/_components/MapView/RecommendationMarker.tsx b/src/app/recommend/_components/MapView/RecommendationMarker.tsx index 5d966b0..27e1c91 100644 --- a/src/app/recommend/_components/MapView/RecommendationMarker.tsx +++ b/src/app/recommend/_components/MapView/RecommendationMarker.tsx @@ -1,7 +1,7 @@ import { CustomOverlayMap, MapMarker } from "react-kakao-maps-sdk"; import { RecommendationResponse } from "@/lib/type"; import Image from "next/image"; -import Temp from "@/assets/icons/temp.jpg"; +import Temp from "../../../../../public/images/temp.jpg"; interface RecommendationMarkerProps extends RecommendationResponse { onClick?: () => void; diff --git a/src/app/recommend/_components/NavBar.tsx b/src/app/recommend/_components/NavBar.tsx index 8fa3c92..adf645e 100644 --- a/src/app/recommend/_components/NavBar.tsx +++ b/src/app/recommend/_components/NavBar.tsx @@ -6,7 +6,7 @@ import LogoKR from "../../../../public/logo/logo_kr.png"; export default function NavBar() { return (
- 새길 로고 +
새만금 개발청 새만금 사업단 diff --git a/src/app/recommend/_components/RecommendationPanel/SpaceCard.tsx b/src/app/recommend/_components/RecommendationPanel/SpaceCard.tsx index ebd9c2e..d4d11aa 100644 --- a/src/app/recommend/_components/RecommendationPanel/SpaceCard.tsx +++ b/src/app/recommend/_components/RecommendationPanel/SpaceCard.tsx @@ -3,7 +3,7 @@ import { getCity } from "@/utils/getCity"; import { CATEGORY } from "@/constants/spaceData"; import { MapPin } from "lucide-react"; import Image from "next/image"; -import Temp from "@/assets/icons/temp.jpg"; +import Temp from "../../../../../public/images/temp.jpg"; export default function SpaceCard({ title, @@ -29,8 +29,8 @@ export default function SpaceCard({

{title}

-
- +
+
{position}
diff --git a/src/assets/icons/check_active.svg b/src/assets/icons/check_active.svg deleted file mode 100644 index bcd5d64..0000000 --- a/src/assets/icons/check_active.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/icons/check_default.svg b/src/assets/icons/check_default.svg deleted file mode 100644 index fee1ecb..0000000 --- a/src/assets/icons/check_default.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/constants/transitionData.ts b/src/constants/transitionData.ts index 66a27ba..3f7d290 100644 --- a/src/constants/transitionData.ts +++ b/src/constants/transitionData.ts @@ -1,5 +1,5 @@ -import MoodFinder from "../../public/illusts/mood_finder.png"; -import CummuteRecommendation from "../../public/illusts/commute_recommendation.png"; +import MoodFinder from "../../public/images/mood_finder.png"; +import CummuteRecommendation from "../../public/images/commute_recommendation.png"; export const transitionData = { toMood: { diff --git a/svgr.d.ts b/svgr.d.ts new file mode 100644 index 0000000..dcd9b4c --- /dev/null +++ b/svgr.d.ts @@ -0,0 +1,5 @@ +declare module "*.svg" { + import React from "react"; + const SVG: React.VFC>; + export default SVG; +} diff --git a/tsconfig.json b/tsconfig.json index 0ac8b19..459f9fe 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,8 +27,10 @@ "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", - "next.config.js", - "src/app/page.jsx" + "next.config.mjs", + "src/app/page.jsx", + "svgr.d.ts", + "src/**/*.d.ts" ], "exclude": ["node_modules"] }