diff --git a/package-lock.json b/package-lock.json index 00190c5f..a35712d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1489,17 +1489,6 @@ "node": ">= 8" } }, - "node_modules/anymatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/arg": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", @@ -2572,9 +2561,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz", - "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==", + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz", + "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -4197,11 +4186,14 @@ } }, "node_modules/jiti": { - "version": "1.21.7", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", - "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", + "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", + "dev": true, + "optional": true, + "peer": true, "bin": { - "jiti": "bin/jiti.js" + "jiti": "lib/jiti-cli.mjs" } }, "node_modules/js-tokens": { @@ -4419,17 +4411,6 @@ "node": ">=8.6" } }, - "node_modules/micromatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -4899,6 +4880,17 @@ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -5358,17 +5350,6 @@ "node": ">=8.10.0" } }, - "node_modules/readdirp/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/recharts": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.1.tgz", @@ -6259,6 +6240,14 @@ "node": ">=14.0.0" } }, + "node_modules/tailwindcss/node_modules/jiti": { + "version": "1.21.7", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", + "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", + "bin": { + "jiti": "bin/jiti.js" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", diff --git a/public/assets/icon_refresh.svg b/public/assets/icon_refresh.svg new file mode 100644 index 00000000..9a8b7b7d --- /dev/null +++ b/public/assets/icon_refresh.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/components/Common/DreamerFilter.tsx b/src/components/Common/DreamerFilter.tsx index cccd1533..d4d13cb7 100644 --- a/src/components/Common/DreamerFilter.tsx +++ b/src/components/Common/DreamerFilter.tsx @@ -1,38 +1,46 @@ -import React, { useState, useEffect, useRef } from 'react'; -import Image from 'next/image'; -import downBlue from '@public/assets/dropdown_down_blue.svg'; -import downGray from '@public/assets/dropdown_down_gray.svg'; +import React, { useState, useEffect, useRef } from "react"; +import Image from "next/image"; +import downBlue from "@public/assets/dropdown_down_blue.svg"; +import downGray from "@public/assets/dropdown_down_gray.svg"; -const placeholder = '지역'; -const items = ['전체', '서울', '경기', '인천', '강원', '충북', '충남', '세종', '대전', '전북']; -const placeholder2 = '서비스'; -const items2 = ['전체', '기념품/쇼핑형', '맛집 탐방형', '액티비티/탐험형', '문화/역사탐방형', '축제참여형', '휴양형']; +const placeholder = "지역"; +const items = ["전체", "서울", "경기", "인천", "강원", "충북", "충남", "세종", "대전", "전북"]; +const placeholder2 = "서비스"; +const items2 = [ + "전체", + "기념품/쇼핑형", + "맛집 탐방형", + "액티비티/탐험형", + "문화/역사탐방형", + "축제참여형", + "휴양형", +]; const serviceTypeMapping: Record = { - '전체': '', - '기념품/쇼핑형': 'SHOPPING', - '맛집 탐방형': 'FOOD_TOUR', - '액티비티/탐험형': 'ACTIVITY', - '문화/역사탐방형': 'CULTURE', - '축제참여형': 'FESTIVAL', - '휴양형': 'RELAXATION', + 전체: "", + "기념품/쇼핑형": "SHOPPING", + "맛집 탐방형": "FOOD_TOUR", + "액티비티/탐험형": "ACTIVITY", + "문화/역사탐방형": "CULTURE", + 축제참여형: "FESTIVAL", + 휴양형: "RELAXATION", }; const areaMapping: Record = { - '전체': '', - '서울': 'SEOUL', - '경기': 'GYEONGGI', - '인천': 'INCHEON', - '강원': 'GANGWON', - '충북': 'CHUNGBUK', - '충남': 'CHUNGNAM', - '세종': 'SEJONG', - '대전': 'DAEJEON', - '전북': 'JEONBUK', + 전체: "", + 서울: "SEOUL", + 경기: "GYEONGGI", + 인천: "INCHEON", + 강원: "GANGWON", + 충북: "CHUNGBUK", + 충남: "CHUNGNAM", + 세종: "SEJONG", + 대전: "DAEJEON", + 전북: "JEONBUK", }; interface DreamerFilterProps { - type: 'location' | 'service'; + type: "location" | "service"; reset: boolean; onSelect: (selectedItem: string) => void; } @@ -59,67 +67,57 @@ const DreamerFilter = ({ type, reset, onSelect }: DreamerFilterProps) => { }; useEffect(() => { - document.addEventListener('mousedown', handleClickOutside); + document.addEventListener("mousedown", handleClickOutside); return () => { - document.removeEventListener('mousedown', handleClickOutside); + document.removeEventListener("mousedown", handleClickOutside); }; }, []); - const itemsToDisplay = type === 'location' ? items : items2; - const placeholderText = type === 'location' ? placeholder : placeholder2; + const itemsToDisplay = type === "location" ? items : items2; + const placeholderText = type === "location" ? placeholder : placeholder2; const handleItemClick = (item: string) => { if (itemsToDisplay.includes(item)) { setSelectedItem(item); setIsOpen(false); - const mappedValue = type === 'service' ? serviceTypeMapping[item] : areaMapping[item]; + const mappedValue = type === "service" ? serviceTypeMapping[item] : areaMapping[item]; onSelect(mappedValue); } }; return ( -
+
{isOpen && ( -
-
- {itemsToDisplay.map(item => ( +
+
+ {itemsToDisplay.map((item) => ( @@ -131,4 +129,4 @@ const DreamerFilter = ({ type, reset, onSelect }: DreamerFilterProps) => { ); }; -export default DreamerFilter; \ No newline at end of file +export default DreamerFilter; diff --git a/src/components/Common/Selector.tsx b/src/components/Common/Selector.tsx index 6a6f4329..b32a90cb 100644 --- a/src/components/Common/Selector.tsx +++ b/src/components/Common/Selector.tsx @@ -6,14 +6,16 @@ const Services = ({ data, className, itemClassName, + useWide, }: { selectedTypes: string[]; toggleSelection?: (type: string) => void; data?: Service[]; className?: string; itemClassName?: string; + useWide?: boolean; }) => ( -
+
{(data || planData.services).map((service, index) => (
@@ -86,6 +90,7 @@ export default function Selector({ data={data as Service[]} className={className} itemClassName={itemClassName} + useWide={useWide} /> )} {category === "locations" && ( diff --git a/src/components/Gnb/NavBar.tsx b/src/components/Gnb/NavBar.tsx index 3133faa6..686a801f 100644 --- a/src/components/Gnb/NavBar.tsx +++ b/src/components/Gnb/NavBar.tsx @@ -57,23 +57,14 @@ const getNotification = () => { }; const NavBar = () => { - const { - isLoggedIn, - nickName, - role, - coconut, - setCoconut, - email, - phoneNumber, - profileImage, - setLogin, - } = useAuthStore(); + const { isLoggedIn, nickName, role, coconut, setCoconut, email, phoneNumber, setLogin } = + useAuthStore(); const [isOpenSidebar, setIsOpenSidebar] = useState(false); const [isOpenNotification, setIsOpenNotification] = useState(false); const [isOpenUserMenu, setIsOpenUserMenu] = useState(false); const [userInfo, setUserInfo] = useState(null); const [notifications, setNotifications] = useState([]); - const [userImage, setUserImage] = useState(profileImage || user_img.src); + const [userImage, setUserImage] = useState(user_img.src); const userMenuRef = useRef(null); const notificationRef = useRef(null); const sideBarRef = useRef(null); @@ -163,11 +154,12 @@ const NavBar = () => { const fetchUserInfo = async () => { try { const userData = await userService.getUserInfo(); + const profileData = await userService.getProfileInfo(); setUserInfo(userData); - const avatarImage = avatarImages.find((avatar) => avatar.key === profileImage); + const avatarImage = avatarImages.find((avatar) => avatar.key === profileData.image); setUserImage(avatarImage ? avatarImage.src : user_img.src); - setLogin(nickName, role, coconut, email, phoneNumber, profileImage); + setLogin(nickName, role, coconut, email, phoneNumber); if (userData.coconut !== coconut) { handleCoconutChange(userData.coconut); } diff --git a/src/components/Landing/MapMarker.tsx b/src/components/Landing/MapMarker.tsx index e774c309..1f3ea9c2 100644 --- a/src/components/Landing/MapMarker.tsx +++ b/src/components/Landing/MapMarker.tsx @@ -5,6 +5,8 @@ import { ComposableMap, Geographies, Geography, Marker } from "react-simple-maps import { PieChart, Pie, Tooltip, Cell } from "recharts"; import planService from "@/services/planService"; import planData from "@/types/planData"; +import Image from "next/image"; +import refresh_icon from "@public/assets/icon_refresh.svg"; const regionNames = planData.locations.reduce( (acc, { name, mapping }) => { @@ -161,7 +163,17 @@ export default function MapMarker() {
{selectedRegion ? ( <> -

{regionNames[selectedRegion.name]} 통계

+
+

+ {regionNames[selectedRegion.name]} 통계 +

+
+ +
+
+

총 서비스 수: {selectedRegion.totalCount}

{selectedRegion.totalCount === 0 ? (
diff --git a/src/features/DetailMaker.tsx b/src/features/DetailMaker.tsx index a4087c61..5e450c22 100644 --- a/src/features/DetailMaker.tsx +++ b/src/features/DetailMaker.tsx @@ -284,7 +284,21 @@ export default function RequestDetailDreamer() {

SNS

- + { + if (!makerProfileInfo?.gallery.startsWith("http")) { + e.preventDefault(); + alert("경력이 없습니다!"); + } + }} + > 링크 이미지
@@ -331,13 +345,16 @@ export default function RequestDetailDreamer() {

서비스 가능 지역

- - +
+
+ +
+
diff --git a/src/features/InformEditMaker.tsx b/src/features/InformEditMaker.tsx index b333b40a..ad0b0bad 100644 --- a/src/features/InformEditMaker.tsx +++ b/src/features/InformEditMaker.tsx @@ -199,6 +199,7 @@ export default function InformEditMaker() { className="overflow-hidden text-ellipsis whitespace-nowrap border-0 bg-color-background-200 pr-10" disabled={!isEmailExist} {...register("password")} + error={!!errors.password} />
@@ -210,9 +211,9 @@ export default function InformEditMaker() { className="overflow-hidden text-ellipsis whitespace-nowrap border-0 bg-color-background-200 pr-10" disabled={!isEmailExist} {...register("newPassword")} - error={!!errors.password} + error={!!errors.newPassword} /> - {errors.password && } + {errors.newPassword && }
diff --git a/src/features/LoginForm.tsx b/src/features/LoginForm.tsx index 3e824be3..17572776 100644 --- a/src/features/LoginForm.tsx +++ b/src/features/LoginForm.tsx @@ -80,12 +80,12 @@ export default function LoginForm() { const isFormValid = Object.values(watchFields).every((value) => value?.toString().trim() !== ""); const ErrorMessage = ({ message }: { message: string | undefined }) => ( -

{message}

+

{message}

); return (
-
+
로고
@@ -117,13 +117,13 @@ export default function LoginForm() { />
-
-

+

+

아직 니가가라하와이 회원이 아니신가요?

이메일로 회원가입하기 diff --git a/src/features/ProfileEditDreamer.tsx b/src/features/ProfileEditDreamer.tsx index 8aadce00..e305805f 100644 --- a/src/features/ProfileEditDreamer.tsx +++ b/src/features/ProfileEditDreamer.tsx @@ -310,6 +310,7 @@ export default function ProfileEditDreamer() { planData.services.find((ser) => ser.mapping === service)?.name || service, )} toggleSelection={handleServiceSelection} + useWide={true} />
diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 865c58a9..d1474feb 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -77,12 +77,12 @@ export default function Home() { 니가가라하와이 - 당신의 특별한 여행 메이트 -
+
-
+
diff --git a/src/services/userService.ts b/src/services/userService.ts index a550c0b8..9f4c5c50 100644 --- a/src/services/userService.ts +++ b/src/services/userService.ts @@ -1,4 +1,4 @@ -import { UNAUTHORIZED } from "@/utils/errorStatus"; +import { BAD_REQUEST } from "@/utils/errorStatus"; import { api } from "./api"; type Role = "DREAMER" | "MAKER"; @@ -135,8 +135,8 @@ const userService = { try { await api.patch("/users/update", payload); } catch (error: any) { - if (error.response && error.response.status === UNAUTHORIZED) { - throw new Error("기존 비밀번호와 일치하지 않습니다."); + if (error.response && error.response.status === BAD_REQUEST) { + throw new Error(error.response.data.message || "알 수 없는 오류가 발생했습니다."); } } }, @@ -191,8 +191,10 @@ const userService = { try { const response = await api.get(`/users/profile/${makerId}`); return response; - } catch (error) { - console.error("메이커 프로필 조회 실패", error); + } catch (error: any) { + if (error.response && error.response.status === BAD_REQUEST) { + throw new Error("존재하지 않은 사이트입니다!"); + } } }, diff --git a/src/utils/validate.ts b/src/utils/validate.ts index 18bd6b37..cedc6410 100644 --- a/src/utils/validate.ts +++ b/src/utils/validate.ts @@ -99,12 +99,28 @@ export const editMakerSchema = z export type EditMakerData = z.infer; -export const signUpOAuthSchema = z.object({ - nickName: z.string().min(1, { message: "닉네임을 입력해 주세요." }), - phoneNumber: z - .string() - .regex(/^010\d{8}$/, { message: "010으로 시작하고 숫자만 입력해 주세요." }), - role: z.enum(["MAKER", "DREAMER"], { message: "역할을 선택해 주세요." }), -}); +export const signUpOAuthSchema = z + .object({ + nickName: z.string().min(1, { message: "닉네임을 입력해 주세요." }), + phoneNumber: z + .string() + .regex(/^010\d{8}$/, { message: "010으로 시작하고 숫자만 입력해 주세요." }), + role: z.enum(["MAKER", "DREAMER"], { message: "역할을 선택해 주세요." }), + password: z.string().optional(), + newPassword: z.string().optional(), + newConfirmPassword: z.string().optional(), + }) + .refine((data) => !data.newPassword || data.password, { + path: ["password"], + message: "새 비밀번호를 설정하려면 현재 비밀번호를 입력해 주세요.", + }) + .refine((data) => !data.newPassword || data.newPassword.length >= 6, { + path: ["newPassword"], + message: "새 비밀번호는 최소 6자 이상이어야 합니다.", + }) + .refine((data) => !data.newPassword || data.newPassword === data.newConfirmPassword, { + path: ["newConfirmPassword"], + message: "새 비밀번호가 일치하지 않습니다.", + }); export type SignUpOAuthData = z.infer;