File tree Expand file tree Collapse file tree 5 files changed +14
-17
lines changed
app/mentor/_ui/MentorClient Expand file tree Collapse file tree 5 files changed +14
-17
lines changed Original file line number Diff line number Diff line change 1- export enum queryKey {
1+ export enum QueryKeys {
22 mentorDetail = "mentorDetail" ,
33 mentoringNewCount = "mentoringNewCount" ,
44 mentorList = "mentorList" ,
Original file line number Diff line number Diff line change @@ -8,15 +8,6 @@ import { UserRole } from "@/types/mentor";
88const useRouterHandler = ( ) : boolean => {
99 const userRole = getUserRoleFromJwt ( ) ;
1010
11- const router = useRouter ( ) ;
12-
13- useEffect ( ( ) => {
14- if ( ! userRole ) {
15- alert ( "로그인이 필요합니다." ) ;
16- router . push ( "/login" ) ;
17- }
18- } , [ userRole , router ] ) ;
19-
2011 const isMentor = userRole === UserRole . MENTOR ;
2112 return isMentor ;
2213} ;
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ import MentorCard from "@/components/mentor/MentorCard";
55import useGetMyMentorProfile from "@/api/mentor/client/useGetMentorMyProfile" ;
66
77const MyMentorSection = ( ) => {
8- const { myMentorProfile } = useGetMyMentorProfile ( ) ;
8+ const { data : myMentorProfile } = useGetMyMentorProfile ( ) ;
99
1010 return (
1111 < >
Original file line number Diff line number Diff line change 11"use client" ;
22
3- import useRouterHandler from "./_hooks/useRouterHandler" ;
3+ import { getUserRoleFromJwt } from "@/utils/jwtUtils" ;
4+
45import MenteePageTabs from "./_ui/MenteePageTabs" ;
56import MentorFindSection from "./_ui/MentorFindSection" ;
6- import MentorPageTabs from "./_ui/MentorPageTabs" ;
7- import MyMentorSection from "./_ui/MyMentorSection" ;
7+
8+ import { UserRole } from "@/types/mentor" ;
9+
10+ // import MentorPageTabs from "./_ui/MentorPageTabs";
11+ // import MyMentorSection from "./_ui/MyMentorSection";
812
913const MentorClient = ( ) => {
10- const isMentor = useRouterHandler ( ) ;
14+ const userRole = getUserRoleFromJwt ( ) ;
15+ const isMentor = userRole === UserRole . MENTOR ;
16+
1117 return (
1218 < >
1319 { isMentor ? (
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ const base64UrlDecode = (input: string): string => {
2626 }
2727} ;
2828
29- export const isTokenExpired = ( token : string ) : boolean => {
29+ export const isTokenExpired = ( token : string | null ) : boolean => {
3030 if ( ! token ) {
3131 return true ;
3232 }
@@ -91,7 +91,7 @@ export const isCurrentTokenExpiredSync = (): boolean => {
9191} ;
9292
9393export const getUserRoleFromJwt = ( ) : string | null => {
94- const token = localStorage . getItem ( "accessToken" ) ;
94+ const token = getAccessToken ( ) ;
9595 if ( ! token ) return null ;
9696
9797 const decoded = parseJwt ( token ) ;
You can’t perform that action at this time.
0 commit comments