From 9e1cc29ec95aba06436c29a35db2962ab0ecabb4 Mon Sep 17 00:00:00 2001 From: manNomi Date: Sat, 14 Feb 2026 19:15:26 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=94=A7=20auth=20=EC=A0=84=EC=97=AD=20?= =?UTF-8?q?=EC=8A=A4=ED=86=A0=EC=96=B4=EC=97=90=20userRole=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/lib/zustand/useAuthStore.ts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apps/web/src/lib/zustand/useAuthStore.ts b/apps/web/src/lib/zustand/useAuthStore.ts index e7de5c47..a3a8c865 100644 --- a/apps/web/src/lib/zustand/useAuthStore.ts +++ b/apps/web/src/lib/zustand/useAuthStore.ts @@ -1,10 +1,28 @@ import { create } from "zustand"; import { persist } from "zustand/middleware"; +import { UserRole } from "@/types/mentor"; + +const parseUserRoleFromToken = (token: string | null): UserRole | null => { + if (!token) return null; + + try { + const payload = JSON.parse(atob(token.split(".")[1])) as { role?: string }; + + if (payload.role === UserRole.MENTOR || payload.role === UserRole.MENTEE || payload.role === UserRole.ADMIN) { + return payload.role; + } + + return null; + } catch { + return null; + } +}; type RefreshStatus = "idle" | "refreshing" | "success" | "failed"; interface AuthState { accessToken: string | null; + userRole: UserRole | null; isAuthenticated: boolean; isLoading: boolean; isInitialized: boolean; @@ -20,6 +38,7 @@ const useAuthStore = create()( persist( (set) => ({ accessToken: null, + userRole: null, isAuthenticated: false, isLoading: false, isInitialized: false, @@ -28,6 +47,7 @@ const useAuthStore = create()( setAccessToken: (token) => { set({ accessToken: token, + userRole: parseUserRoleFromToken(token), isAuthenticated: true, isLoading: false, isInitialized: true, @@ -38,6 +58,7 @@ const useAuthStore = create()( clearAccessToken: () => { set({ accessToken: null, + userRole: null, isAuthenticated: false, isLoading: false, isInitialized: true, @@ -66,6 +87,7 @@ const useAuthStore = create()( onRehydrateStorage: () => (state) => { // hydration 완료 후 isInitialized를 true로 설정 if (state) { + state.userRole = parseUserRoleFromToken(state.accessToken); state.isInitialized = true; } }, From 88b244a6b478ebc235eed9ec0ea891eecd7866fa Mon Sep 17 00:00:00 2001 From: manNomi Date: Sat, 14 Feb 2026 19:15:34 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20=EB=A9=98=ED=86=A0=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=ED=98=B8=EC=B6=9C=20=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EB=B0=8F=20=EB=A9=98=ED=86=A0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mentor/MentorApplyCountContent/index.tsx | 28 +++++++++++-------- .../hooks/useExpandCardClickHandler.ts | 6 ++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx b/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx index 00e16474..0a962f85 100644 --- a/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx +++ b/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx @@ -1,21 +1,18 @@ "use client"; -import Link from "next/link"; +import { useRouter } from "next/navigation"; import { useState } from "react"; -import { useGetUnconfirmedMentoringCount } from "@/apis/mentor"; +import { useGetMentoringUncheckedCount } from "@/apis/mentor"; import useAuthStore from "@/lib/zustand/useAuthStore"; import { UserRole } from "@/types/mentor"; -import { tokenParse } from "@/utils/jwtUtils"; const MentorApplyCountContent = () => { - // 로그인 된경우에만 신규 신청 카운트 모달 표시 - const { accessToken, isInitialized } = useAuthStore(); - const isMentor = - tokenParse(accessToken)?.role === UserRole.MENTOR || - tokenParse(accessToken)?.role === UserRole.ADMIN; + const router = useRouter(); + const { isInitialized, isAuthenticated, userRole } = useAuthStore(); + const isMentor = userRole === UserRole.MENTOR; - const { data: count, isSuccess } = useGetUnconfirmedMentoringCount( - isInitialized && !!accessToken && isMentor, + const { data: count, isSuccess } = useGetMentoringUncheckedCount( + isInitialized && isAuthenticated && isMentor, ); const [isModalOpen, setIsModalOpen] = useState(true); @@ -39,7 +36,14 @@ const MentorApplyCountContent = () => { > ✕ - setIsModalOpen(false)}> + ); }; diff --git a/apps/web/src/components/mentor/MentorExpandChatCard/hooks/useExpandCardClickHandler.ts b/apps/web/src/components/mentor/MentorExpandChatCard/hooks/useExpandCardClickHandler.ts index 6907ffbf..fea368a4 100644 --- a/apps/web/src/components/mentor/MentorExpandChatCard/hooks/useExpandCardClickHandler.ts +++ b/apps/web/src/components/mentor/MentorExpandChatCard/hooks/useExpandCardClickHandler.ts @@ -2,7 +2,6 @@ import { useState } from "react"; import { usePatchMenteeCheckMentorings, usePatchMentorCheckMentorings } from "@/apis/mentor"; import useAuthStore from "@/lib/zustand/useAuthStore"; import { UserRole } from "@/types/mentor"; -import { tokenParse } from "@/utils/jwtUtils"; interface UseExpandCardClickHandlerReturn { isExpanded: boolean; @@ -18,9 +17,8 @@ const useExpandCardClickHandler = ({ mentoringId, initChecked = false, }: UseExpandCardClickHandlerProps): UseExpandCardClickHandlerReturn => { - const { accessToken } = useAuthStore(); - const isMentor = - tokenParse(accessToken)?.role === UserRole.MENTOR || tokenParse(accessToken)?.role === UserRole.ADMIN; + const userRole = useAuthStore((state) => state.userRole); + const isMentor = userRole === UserRole.MENTOR; const [isExpanded, setIsExpanded] = useState(false); const [isCheckedState, setIsCheckedState] = useState(initChecked || false); From e6f74502323d6df173895632fbfae944480a45db Mon Sep 17 00:00:00 2001 From: manNomi Date: Sat, 14 Feb 2026 19:30:00 +0900 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20RootModal?= =?UTF-8?q?=20=EB=AA=A8=EB=8B=AC=20=EB=A0=8C=EB=8D=94=EB=A7=81=EC=9D=84=20?= =?UTF-8?q?=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8=ED=8A=B8=EB=A1=9C=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/components/layout/RootModal/index.tsx | 8 +------- .../components/layout/RootModal/ui/ClientModal/index.tsx | 9 ++++++--- .../components/layout/RootModal/ui/ServerModal/index.tsx | 9 --------- 3 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 apps/web/src/components/layout/RootModal/ui/ServerModal/index.tsx diff --git a/apps/web/src/components/layout/RootModal/index.tsx b/apps/web/src/components/layout/RootModal/index.tsx index 263b12c0..a6f96e12 100644 --- a/apps/web/src/components/layout/RootModal/index.tsx +++ b/apps/web/src/components/layout/RootModal/index.tsx @@ -1,13 +1,7 @@ import ClientModal from "./ui/ClientModal"; -import ServerModal from "./ui/ServerModal"; const RootModal = () => { - return ( - <> - - - - ); + return ; }; export default RootModal; diff --git a/apps/web/src/components/layout/RootModal/ui/ClientModal/index.tsx b/apps/web/src/components/layout/RootModal/ui/ClientModal/index.tsx index 14678315..83a6eb7d 100644 --- a/apps/web/src/components/layout/RootModal/ui/ClientModal/index.tsx +++ b/apps/web/src/components/layout/RootModal/ui/ClientModal/index.tsx @@ -1,5 +1,6 @@ "use client"; +import MentorApplyCountModal from "@/components/mentor/MentorApplyCountModal"; import IconConfirmModal from "@/components/modal/IconConfirmModal"; import { useConfirmModalStore } from "@/lib/zustand/useConfirmModalStore"; @@ -7,8 +8,10 @@ import { useConfirmModalStore } from "@/lib/zustand/useConfirmModalStore"; const ClientModal = () => { const { isOpen, payload, confirm, reject } = useConfirmModalStore(); - return ( + return [ + , { rejectMessage={payload?.rejectMessage || "취소"} onConfirm={confirm} onClose={reject} - /> - ); + />, + ]; }; export default ClientModal; diff --git a/apps/web/src/components/layout/RootModal/ui/ServerModal/index.tsx b/apps/web/src/components/layout/RootModal/ui/ServerModal/index.tsx deleted file mode 100644 index ba5ef93d..00000000 --- a/apps/web/src/components/layout/RootModal/ui/ServerModal/index.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import MentorApplyCountModal from "@/components/mentor/MentorApplyCountModal"; -import isServerStateLogin from "@/utils/isServerStateLogin"; - -const ServerModal = () => { - // 서버에서 로그인 상태 확인 - const isServerLogin = isServerStateLogin(); - return <>{isServerLogin ? : null}; -}; -export default ServerModal; From 60bed94ce415173e45aa7e7d528b771a4d3fdb0a Mon Sep 17 00:00:00 2001 From: manNomi Date: Sat, 14 Feb 2026 21:48:14 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20web=20CI=20=ED=8F=AC=EB=A7=B7=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EB=B0=8F=20=EB=A9=98=ED=86=A0=20=EC=B9=B4?= =?UTF-8?q?=EC=9A=B4=ED=8A=B8=20=ED=9B=85=20=EC=B0=B8=EC=A1=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/apis/Auth/postAppleAuth.ts | 52 +-- apps/web/src/apis/Auth/postKakaoAuth.ts | 54 +-- .../server/getRecommendedUniversity.ts | 12 +- .../server/getSearchUniversitiesByFilter.ts | 82 +++-- .../server/getSearchUniversitiesByText.ts | 82 +++-- .../app/my/modify/_ui/ModifyContent/index.tsx | 121 +++---- .../(home)/_ui/HomeUniversityCard.tsx | 8 +- .../_ui/UniversityListContent.tsx | 3 +- .../search/_ui/SearchPageContent.tsx | 6 +- .../[homeUniversity]/search/page.tsx | 5 +- .../list/[homeUniversityName]/page.tsx | 4 +- .../components/login/signup/SignupSurvey.tsx | 308 +++++++++--------- .../mentor/MentorApplyCountContent/index.tsx | 101 +++--- 13 files changed, 396 insertions(+), 442 deletions(-) diff --git a/apps/web/src/apis/Auth/postAppleAuth.ts b/apps/web/src/apis/Auth/postAppleAuth.ts index 900d27d5..93249feb 100644 --- a/apps/web/src/apis/Auth/postAppleAuth.ts +++ b/apps/web/src/apis/Auth/postAppleAuth.ts @@ -11,36 +11,36 @@ import { type AppleAuthRequest, type AppleAuthResponse, authApi } from "./api"; * @description 애플 로그인을 위한 useMutation 커스텀 훅 */ const usePostAppleAuth = () => { - const router = useRouter(); - const searchParams = useSearchParams(); + const router = useRouter(); + const searchParams = useSearchParams(); - return useMutation({ - mutationFn: (data) => authApi.postAppleAuth(data), - onSuccess: (data) => { - if (data.isRegistered) { - // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 - // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 - useAuthStore.getState().setAccessToken(data.accessToken); + return useMutation({ + mutationFn: (data) => authApi.postAppleAuth(data), + onSuccess: (data) => { + if (data.isRegistered) { + // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 + // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 + useAuthStore.getState().setAccessToken(data.accessToken); - // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 - const redirectParam = searchParams.get("redirect"); - const safeRedirect = validateSafeRedirect(redirectParam); + // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 + const redirectParam = searchParams.get("redirect"); + const safeRedirect = validateSafeRedirect(redirectParam); - toast.success("로그인에 성공했습니다."); + toast.success("로그인에 성공했습니다."); - setTimeout(() => { - router.push(safeRedirect); - }, 100); - } else { - // 새로운 회원일 시 - 회원가입 페이지로 이동 - router.push(`/sign-up?token=${data.signUpToken}`); - } - }, - onError: () => { - toast.error("애플 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); - router.push("/login"); - }, - }); + setTimeout(() => { + router.push(safeRedirect); + }, 100); + } else { + // 새로운 회원일 시 - 회원가입 페이지로 이동 + router.push(`/sign-up?token=${data.signUpToken}`); + } + }, + onError: () => { + toast.error("애플 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); + router.push("/login"); + }, + }); }; export default usePostAppleAuth; diff --git a/apps/web/src/apis/Auth/postKakaoAuth.ts b/apps/web/src/apis/Auth/postKakaoAuth.ts index 40894959..8f641666 100644 --- a/apps/web/src/apis/Auth/postKakaoAuth.ts +++ b/apps/web/src/apis/Auth/postKakaoAuth.ts @@ -11,37 +11,37 @@ import { authApi, type KakaoAuthRequest, type KakaoAuthResponse } from "./api"; * @description 카카오 로그인을 위한 useMutation 커스텀 훅 */ const usePostKakaoAuth = () => { - const { setAccessToken } = useAuthStore(); - const router = useRouter(); - const searchParams = useSearchParams(); + const { setAccessToken } = useAuthStore(); + const router = useRouter(); + const searchParams = useSearchParams(); - return useMutation({ - mutationFn: (data) => authApi.postKakaoAuth(data), - onSuccess: (data) => { - if (data.isRegistered) { - // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 - // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 - setAccessToken(data.accessToken); + return useMutation({ + mutationFn: (data) => authApi.postKakaoAuth(data), + onSuccess: (data) => { + if (data.isRegistered) { + // 기존 회원일 시 - Zustand persist가 자동으로 localStorage에 저장 + // refreshToken은 서버에서 HTTP-only 쿠키로 자동 설정됨 + setAccessToken(data.accessToken); - // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 - const redirectParam = searchParams.get("redirect"); - const safeRedirect = validateSafeRedirect(redirectParam); + // 안전한 리다이렉트 처리 - 오픈 리다이렉트 방지 + const redirectParam = searchParams.get("redirect"); + const safeRedirect = validateSafeRedirect(redirectParam); - toast.success("로그인에 성공했습니다."); + toast.success("로그인에 성공했습니다."); - setTimeout(() => { - router.push(safeRedirect); - }, 100); - } else { - // 새로운 회원일 시 - 회원가입 페이지로 이동 - router.push(`/sign-up?token=${data.signUpToken}`); - } - }, - onError: () => { - toast.error("카카오 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); - router.push("/login"); - }, - }); + setTimeout(() => { + router.push(safeRedirect); + }, 100); + } else { + // 새로운 회원일 시 - 회원가입 페이지로 이동 + router.push(`/sign-up?token=${data.signUpToken}`); + } + }, + onError: () => { + toast.error("카카오 로그인 중 오류가 발생했습니다. 다시 시도해주세요."); + router.push("/login"); + }, + }); }; export default usePostKakaoAuth; diff --git a/apps/web/src/apis/universities/server/getRecommendedUniversity.ts b/apps/web/src/apis/universities/server/getRecommendedUniversity.ts index 3950cfe5..b3f7ae70 100644 --- a/apps/web/src/apis/universities/server/getRecommendedUniversity.ts +++ b/apps/web/src/apis/universities/server/getRecommendedUniversity.ts @@ -4,15 +4,15 @@ import serverFetch from "@/utils/serverFetchUtil"; type GetRecommendedUniversityResponse = { recommendedUniversities: ListUniversity[] }; const getRecommendedUniversity = async () => { - const endpoint = "/univ-apply-infos/recommend"; + const endpoint = "/univ-apply-infos/recommend"; - const res = await serverFetch(endpoint); + const res = await serverFetch(endpoint); - if (!res.ok) { - console.error(`Failed to fetch recommended universities:`, res.error); - } + if (!res.ok) { + console.error(`Failed to fetch recommended universities:`, res.error); + } - return res; + return res; }; export default getRecommendedUniversity; diff --git a/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts b/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts index 2b6ba386..3fdd37c4 100644 --- a/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts +++ b/apps/web/src/apis/universities/server/getSearchUniversitiesByFilter.ts @@ -3,60 +3,58 @@ import type { CountryCode, LanguageTestType, ListUniversity } from "@/types/univ import serverFetch from "@/utils/serverFetchUtil"; interface UniversitySearchResponse { - univApplyInfoPreviews: ListUniversity[]; + univApplyInfoPreviews: ListUniversity[]; } /** * 필터 검색에 사용될 파라미터 타입 */ export interface UniversitySearchFilterParams { - languageTestType?: LanguageTestType; - testScore?: number; - countryCode?: CountryCode[]; + languageTestType?: LanguageTestType; + testScore?: number; + countryCode?: CountryCode[]; } export const getSearchUniversitiesByFilter = async ( - filters: UniversitySearchFilterParams, + filters: UniversitySearchFilterParams, ): Promise => { - const params = new URLSearchParams(); - - if (filters.languageTestType) { - params.append("languageTestType", filters.languageTestType); - } - if (filters.testScore !== undefined) { - params.append("testScore", String(filters.testScore)); - } - // countryCode는 여러 개일 수 있으므로 각각 append 해줍니다. - if (filters.countryCode) { - filters.countryCode.forEach((code) => params.append("countryCode", code)); - } - - // 필터 값이 하나도 없으면 빈 배열을 반환합니다. - if (params.size === 0) { - return []; - } - - const endpoint = `/univ-apply-infos/search/filter?${params.toString()}`; - const response = await serverFetch(endpoint); - - if (!response.ok) { - console.error(`Failed to search universities by filter:`, response.error); - return []; - } - - return response.data.univApplyInfoPreviews; + const params = new URLSearchParams(); + + if (filters.languageTestType) { + params.append("languageTestType", filters.languageTestType); + } + if (filters.testScore !== undefined) { + params.append("testScore", String(filters.testScore)); + } + // countryCode는 여러 개일 수 있으므로 각각 append 해줍니다. + if (filters.countryCode) { + filters.countryCode.forEach((code) => params.append("countryCode", code)); + } + + // 필터 값이 하나도 없으면 빈 배열을 반환합니다. + if (params.size === 0) { + return []; + } + + const endpoint = `/univ-apply-infos/search/filter?${params.toString()}`; + const response = await serverFetch(endpoint); + + if (!response.ok) { + console.error(`Failed to search universities by filter:`, response.error); + return []; + } + + return response.data.univApplyInfoPreviews; }; -export const getSearchUniversitiesAllRegions = async (): Promise< - ListUniversity[] -> => { - const endpoint = `/univ-apply-infos/search/filter`; - const response = await serverFetch(endpoint); +export const getSearchUniversitiesAllRegions = async (): Promise => { + const endpoint = `/univ-apply-infos/search/filter`; + const response = await serverFetch(endpoint); - if (!response.ok) { - console.error(`Failed to fetch all regions universities:`, response.error); - return []; - } + if (!response.ok) { + console.error(`Failed to fetch all regions universities:`, response.error); + return []; + } - return response.data.univApplyInfoPreviews; + return response.data.univApplyInfoPreviews; }; diff --git a/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts b/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts index 92f4b362..dd20d096 100644 --- a/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts +++ b/apps/web/src/apis/universities/server/getSearchUniversitiesByText.ts @@ -3,54 +3,48 @@ import serverFetch from "@/utils/serverFetchUtil"; // --- 타입 정의 --- interface UniversitySearchResponse { - univApplyInfoPreviews: ListUniversity[]; + univApplyInfoPreviews: ListUniversity[]; } -export const getUniversitiesByText = async ( - value: string, -): Promise => { - if (value === null || value === undefined) { - return []; - } - const endpoint = `/univ-apply-infos/search/text?value=${encodeURIComponent(value)}`; - const response = await serverFetch(endpoint); - - if (!response.ok) { - console.error( - `Failed to search universities by text (value: "${value}"):`, - response.error, - ); - return []; - } - - return response.data.univApplyInfoPreviews; +export const getUniversitiesByText = async (value: string): Promise => { + if (value === null || value === undefined) { + return []; + } + const endpoint = `/univ-apply-infos/search/text?value=${encodeURIComponent(value)}`; + const response = await serverFetch(endpoint); + + if (!response.ok) { + console.error(`Failed to search universities by text (value: "${value}"):`, response.error); + return []; + } + + return response.data.univApplyInfoPreviews; }; export const getAllUniversities = async (): Promise => { - return getUniversitiesByText(""); + return getUniversitiesByText(""); }; -export const getCategorizedUniversities = - async (): Promise => { - // 1. 단 한 번의 API 호출로 모든 대학 데이터를 가져옵니다. - const allUniversities = await getAllUniversities(); - - const categorizedList: AllRegionsUniversityList = { - [RegionEnumExtend.ALL]: allUniversities, - [RegionEnumExtend.AMERICAS]: [], - [RegionEnumExtend.EUROPE]: [], - [RegionEnumExtend.ASIA]: [], - [RegionEnumExtend.CHINA]: [], - }; - if (!allUniversities) return categorizedList; - - for (const university of allUniversities) { - const region = university.region as RegionEnumExtend; // API 응답의 region 타입을 enum으로 간주 - - if (region && Object.hasOwn(categorizedList, region)) { - categorizedList[region].push(university); - } - } - - return categorizedList; - }; +export const getCategorizedUniversities = async (): Promise => { + // 1. 단 한 번의 API 호출로 모든 대학 데이터를 가져옵니다. + const allUniversities = await getAllUniversities(); + + const categorizedList: AllRegionsUniversityList = { + [RegionEnumExtend.ALL]: allUniversities, + [RegionEnumExtend.AMERICAS]: [], + [RegionEnumExtend.EUROPE]: [], + [RegionEnumExtend.ASIA]: [], + [RegionEnumExtend.CHINA]: [], + }; + if (!allUniversities) return categorizedList; + + for (const university of allUniversities) { + const region = university.region as RegionEnumExtend; // API 응답의 region 타입을 enum으로 간주 + + if (region && Object.hasOwn(categorizedList, region)) { + categorizedList[region].push(university); + } + } + + return categorizedList; +}; diff --git a/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx b/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx index 197ca9d7..a6811124 100644 --- a/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx +++ b/apps/web/src/app/my/modify/_ui/ModifyContent/index.tsx @@ -11,85 +11,64 @@ import InputField from "./_ui/InputFiled"; import ReadOnlyField from "./_ui/ReadOnlyField"; const ModifyContent = () => { - const { methods, myInfo, onSubmit } = useModifyUserHookform(); + const { methods, myInfo, onSubmit } = useModifyUserHookform(); - const defaultUniversity: string = - (myInfo?.role === UserRole.MENTOR || myInfo?.role === UserRole.ADMIN) && - myInfo.attendedUniversity - ? myInfo.attendedUniversity - : "인하대학교"; + const defaultUniversity: string = + (myInfo?.role === UserRole.MENTOR || myInfo?.role === UserRole.ADMIN) && myInfo.attendedUniversity + ? myInfo.attendedUniversity + : "인하대학교"; - const { - handleSubmit, - formState: { isValid, isDirty }, - } = methods; + const { + handleSubmit, + formState: { isValid, isDirty }, + } = methods; - if (!myInfo) { - return ; - } - return ( - -
-
- {/* Profile Image Section */} - + if (!myInfo) { + return ; + } + return ( + +
+ + {/* Profile Image Section */} + - {/* Form Fields */} -
- {/* 닉네임 - 수정 가능 */} - + {/* Form Fields */} +
+ {/* 닉네임 - 수정 가능 */} + - {/* 출신학교 - 읽기 전용 */} - + {/* 출신학교 - 읽기 전용 */} + - {/* 수학 학교 - 읽기 전용 */} - + {/* 수학 학교 - 읽기 전용 */} + - {/* 사용자 유형 - 읽기 전용 */} - -
+ {/* 사용자 유형 - 읽기 전용 */} + +
- {/* Submit Button */} -
- -
- -
- - ); + {/* Submit Button */} +
+ +
+ +
+ + ); }; export default ModifyContent; diff --git a/apps/web/src/app/university/(home)/_ui/HomeUniversityCard.tsx b/apps/web/src/app/university/(home)/_ui/HomeUniversityCard.tsx index 5c37567d..e646b073 100644 --- a/apps/web/src/app/university/(home)/_ui/HomeUniversityCard.tsx +++ b/apps/web/src/app/university/(home)/_ui/HomeUniversityCard.tsx @@ -47,13 +47,7 @@ const HomeUniversityCard = ({ university }: HomeUniversityCardProps) => { xmlns="http://www.w3.org/2000/svg" className="text-k-400 group-hover:text-primary" > - + diff --git a/apps/web/src/app/university/[homeUniversity]/_ui/UniversityListContent.tsx b/apps/web/src/app/university/[homeUniversity]/_ui/UniversityListContent.tsx index bf5d8b6e..97df47b1 100644 --- a/apps/web/src/app/university/[homeUniversity]/_ui/UniversityListContent.tsx +++ b/apps/web/src/app/university/[homeUniversity]/_ui/UniversityListContent.tsx @@ -28,8 +28,7 @@ const UniversityListContent = ({ universities, homeUniversity, homeUniversitySlu if (searchText.trim()) { const searchLower = searchText.toLowerCase().trim(); result = result.filter( - (uni) => - uni.koreanName.toLowerCase().includes(searchLower) || uni.country.toLowerCase().includes(searchLower), + (uni) => uni.koreanName.toLowerCase().includes(searchLower) || uni.country.toLowerCase().includes(searchLower), ); } diff --git a/apps/web/src/app/university/[homeUniversity]/search/_ui/SearchPageContent.tsx b/apps/web/src/app/university/[homeUniversity]/search/_ui/SearchPageContent.tsx index afb4e40a..80050f0a 100644 --- a/apps/web/src/app/university/[homeUniversity]/search/_ui/SearchPageContent.tsx +++ b/apps/web/src/app/university/[homeUniversity]/search/_ui/SearchPageContent.tsx @@ -6,18 +6,16 @@ import { useRouter } from "next/navigation"; import { useMemo, useState } from "react"; import { Controller, type SubmitHandler, useForm } from "react-hook-form"; import { z } from "zod"; - -import { IconSearch } from "@/public/svgs/search"; +import CustomDropdown from "@/app/university/CustomDropdown"; import { COUNTRY_CODE_MAP, LANGUAGE_TEST_TYPE_MAP, REGION_TO_COUNTRIES_MAP, REGIONS_SEARCH, } from "@/constants/university"; +import { IconSearch } from "@/public/svgs/search"; import { CountryCode, LanguageTestType } from "@/types/university"; -import CustomDropdown from "@/app/university/CustomDropdown"; - // Zod 스키마 const searchSchema = z.object({ searchText: z.string().optional(), diff --git a/apps/web/src/app/university/[homeUniversity]/search/page.tsx b/apps/web/src/app/university/[homeUniversity]/search/page.tsx index f35476c1..960bc518 100644 --- a/apps/web/src/app/university/[homeUniversity]/search/page.tsx +++ b/apps/web/src/app/university/[homeUniversity]/search/page.tsx @@ -49,7 +49,10 @@ const SearchPage = async ({ params }: PageProps) => { return ( <> - +

오직 나를 위한

diff --git a/apps/web/src/app/university/list/[homeUniversityName]/page.tsx b/apps/web/src/app/university/list/[homeUniversityName]/page.tsx index b427c9f3..8126e5ea 100644 --- a/apps/web/src/app/university/list/[homeUniversityName]/page.tsx +++ b/apps/web/src/app/university/list/[homeUniversityName]/page.tsx @@ -41,7 +41,9 @@ export async function generateMetadata({ params }: PageProps): Promise const UniversityListPage = async ({ params }: PageProps) => { const { homeUniversityName } = await params; - const universityName = HOME_UNIVERSITY_SLUG_MAP[homeUniversityName as HomeUniversitySlug] as HomeUniversityName | undefined; + const universityName = HOME_UNIVERSITY_SLUG_MAP[homeUniversityName as HomeUniversitySlug] as + | HomeUniversityName + | undefined; if (!universityName) { notFound(); diff --git a/apps/web/src/components/login/signup/SignupSurvey.tsx b/apps/web/src/components/login/signup/SignupSurvey.tsx index fb59fab5..de393136 100644 --- a/apps/web/src/components/login/signup/SignupSurvey.tsx +++ b/apps/web/src/components/login/signup/SignupSurvey.tsx @@ -16,167 +16,157 @@ import SignupProfileScreen from "./SignupProfileScreen"; import SignupRegionScreen from "./SignupRegionScreen"; type SignupSurveyProps = { - baseNickname: string; - baseEmail: string; - baseProfileImageUrl: string; + baseNickname: string; + baseEmail: string; + baseProfileImageUrl: string; }; -const SignupSurvey = ({ - baseNickname, - baseEmail, - baseProfileImageUrl, -}: SignupSurveyProps) => { - const router = useRouter(); - const searchParams = useSearchParams(); - - const signUpToken = searchParams?.get("token"); - if (!signUpToken) { - router.push("/login"); - } - const { setAccessToken } = useAuthStore(); - const [curStage, setCurStage] = useState(1); - const [curProgress, setCurProgress] = useState(0); - - const [curPreparation, setCurPreparation] = - useState(null); - - const [region, setRegion] = useState( - null, - ); - const [countries, setCountries] = useState([]); - - const [nickname, setNickname] = useState(baseNickname); - const [profileImageFile, setProfileImageFile] = useState(null); - - const signUpMutation = usePostSignUp(); - const uploadImageMutation = useUploadProfileImagePublic(); - - useEffect(() => { - setCurProgress(((curStage - 1) / 3) * 100); - }, [curStage]); - - const createRegisterRequest = async (): Promise => { - const submitRegion: RegionKo[] = - region === "아직 잘 모르겠어요" ? [] : [region as RegionKo]; - - if (!curPreparation) { - throw new Error("준비 단계를 선택해주세요"); - } - - let imageUrl: string | null = baseProfileImageUrl; - - if (profileImageFile) { - try { - const result = await uploadImageMutation.mutateAsync(profileImageFile); - imageUrl = result.fileUrl; - } catch (err: unknown) { - const error = err as { message?: string }; - console.error("Error", error.message); - // toast.error는 hook의 onError에서 이미 처리되므로 중복 호출 제거 - } - } - - return { - signUpToken: signUpToken as string, - interestedRegions: submitRegion, - interestedCountries: countries, - preparationStatus: curPreparation, - nickname, - profileImageUrl: imageUrl, - }; - }; - - const submitRegisterRequest = async () => { - try { - const registerRequest = await createRegisterRequest(); - signUpMutation.mutate(registerRequest, { - onSuccess: (data) => { - setAccessToken(data.accessToken); - toast.success("회원가입이 완료되었습니다."); - - setTimeout(() => { - router.push("/"); - }, 100); - }, - onError: (error: unknown) => { - const axiosError = error as { - response?: { data?: { message?: string } }; - message?: string; - }; - if (axiosError.response) { - console.error("Axios response error", axiosError.response); - toast.error( - axiosError.response.data?.message || "회원가입에 실패했습니다.", - ); - } else { - console.error("Error", axiosError.message); - toast.error(axiosError.message || "회원가입에 실패했습니다."); - } - }, - }); - } catch (err: unknown) { - const error = err as { message?: string }; - console.error("Error", error.message); - toast.error(error.message || "회원가입에 실패했습니다."); - } - }; - - const renderCurrentSurvey = () => { - switch (curStage) { - case 1: - return ( - { - setCurStage(2); - }} - /> - ); - case 2: - return ( - { - setCurStage(3); - }} - /> - ); - case 3: - return ( - { - setCurStage(4); - }} - /> - ); - case 4: - return ( - - ); - default: - return
회원 가입이 완료되었습니다
; - } - }; - - return ( -
-
- -
- {renderCurrentSurvey()} -
- ); +const SignupSurvey = ({ baseNickname, baseEmail, baseProfileImageUrl }: SignupSurveyProps) => { + const router = useRouter(); + const searchParams = useSearchParams(); + + const signUpToken = searchParams?.get("token"); + if (!signUpToken) { + router.push("/login"); + } + const { setAccessToken } = useAuthStore(); + const [curStage, setCurStage] = useState(1); + const [curProgress, setCurProgress] = useState(0); + + const [curPreparation, setCurPreparation] = useState(null); + + const [region, setRegion] = useState(null); + const [countries, setCountries] = useState([]); + + const [nickname, setNickname] = useState(baseNickname); + const [profileImageFile, setProfileImageFile] = useState(null); + + const signUpMutation = usePostSignUp(); + const uploadImageMutation = useUploadProfileImagePublic(); + + useEffect(() => { + setCurProgress(((curStage - 1) / 3) * 100); + }, [curStage]); + + const createRegisterRequest = async (): Promise => { + const submitRegion: RegionKo[] = region === "아직 잘 모르겠어요" ? [] : [region as RegionKo]; + + if (!curPreparation) { + throw new Error("준비 단계를 선택해주세요"); + } + + let imageUrl: string | null = baseProfileImageUrl; + + if (profileImageFile) { + try { + const result = await uploadImageMutation.mutateAsync(profileImageFile); + imageUrl = result.fileUrl; + } catch (err: unknown) { + const error = err as { message?: string }; + console.error("Error", error.message); + // toast.error는 hook의 onError에서 이미 처리되므로 중복 호출 제거 + } + } + + return { + signUpToken: signUpToken as string, + interestedRegions: submitRegion, + interestedCountries: countries, + preparationStatus: curPreparation, + nickname, + profileImageUrl: imageUrl, + }; + }; + + const submitRegisterRequest = async () => { + try { + const registerRequest = await createRegisterRequest(); + signUpMutation.mutate(registerRequest, { + onSuccess: (data) => { + setAccessToken(data.accessToken); + toast.success("회원가입이 완료되었습니다."); + + setTimeout(() => { + router.push("/"); + }, 100); + }, + onError: (error: unknown) => { + const axiosError = error as { + response?: { data?: { message?: string } }; + message?: string; + }; + if (axiosError.response) { + console.error("Axios response error", axiosError.response); + toast.error(axiosError.response.data?.message || "회원가입에 실패했습니다."); + } else { + console.error("Error", axiosError.message); + toast.error(axiosError.message || "회원가입에 실패했습니다."); + } + }, + }); + } catch (err: unknown) { + const error = err as { message?: string }; + console.error("Error", error.message); + toast.error(error.message || "회원가입에 실패했습니다."); + } + }; + + const renderCurrentSurvey = () => { + switch (curStage) { + case 1: + return ( + { + setCurStage(2); + }} + /> + ); + case 2: + return ( + { + setCurStage(3); + }} + /> + ); + case 3: + return ( + { + setCurStage(4); + }} + /> + ); + case 4: + return ( + + ); + default: + return
회원 가입이 완료되었습니다
; + } + }; + + return ( +
+
+ +
+ {renderCurrentSurvey()} +
+ ); }; export default SignupSurvey; diff --git a/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx b/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx index 0a962f85..bdef425e 100644 --- a/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx +++ b/apps/web/src/components/mentor/MentorApplyCountContent/index.tsx @@ -2,68 +2,65 @@ import { useRouter } from "next/navigation"; import { useState } from "react"; -import { useGetMentoringUncheckedCount } from "@/apis/mentor"; +import { useGetUnconfirmedMentoringCount } from "@/apis/mentor"; import useAuthStore from "@/lib/zustand/useAuthStore"; import { UserRole } from "@/types/mentor"; const MentorApplyCountContent = () => { - const router = useRouter(); - const { isInitialized, isAuthenticated, userRole } = useAuthStore(); - const isMentor = userRole === UserRole.MENTOR; + const router = useRouter(); + const { isInitialized, isAuthenticated, userRole } = useAuthStore(); + const isMentor = userRole === UserRole.MENTOR; - const { data: count, isSuccess } = useGetMentoringUncheckedCount( - isInitialized && isAuthenticated && isMentor, - ); + const { data: count, isSuccess } = useGetUnconfirmedMentoringCount(isInitialized && isAuthenticated && isMentor); - const [isModalOpen, setIsModalOpen] = useState(true); + const [isModalOpen, setIsModalOpen] = useState(true); - // 신규 신청 없으면 표시 - if (!isInitialized || !isMentor || !isSuccess || !isModalOpen || count === 0) - return null; + // 신규 신청 없으면 표시 + if (!isInitialized || !isMentor || !isSuccess || !isModalOpen || count === 0) return null; - return ( -
- {/* close button */} - - + -
- ); + {/* right: count */} +
+ 신규 신청 +
{count}명
+
+
+ + + ); }; export default MentorApplyCountContent;