@@ -34,20 +34,20 @@ import {
3434 Sidebar as TailwindSidebar ,
3535} from "@tw/sidebar" ;
3636import { useEffect , useState } from "react" ;
37- import { PermissionRole , normalizePermissionRole } from "@/types/api" ;
3837import { useNavigate } from "react-router" ;
38+ import { GamevaultUserRoleEnum } from "../api" ;
3939import { useNews } from "../hooks/useNews" ;
4040import ThemeSwitch from "./ThemeSwitch" ;
41- import { NewsDialog } from "./news/NewsDialog" ;
4241import { UserEditorModal } from "./admin/UserEditorModal" ;
42+ import { NewsDialog } from "./news/NewsDialog" ;
4343
4444export function Sidebar ( ) {
4545 const { user, logout } = useAuth ( ) ;
4646 const navigate = useNavigate ( ) ;
4747 const [ showNews , setShowNews ] = useState ( false ) ;
4848 const [ showEditProfile , setShowEditProfile ] = useState ( false ) ;
49- const username = user ?. username || ( user as any ) ?. Username || "Unknown" ;
50- const email = user ?. email || ( user as any ) ?. EMail || "" ;
49+ const username = user ?. username || "Unknown User " ;
50+ const email = user ?. email || "" ;
5151 const avatar = user ?. avatar ;
5252 const { hasNewNews } = useNews ( ) ;
5353 const [ badgeVisible , setBadgeVisible ] = useState ( hasNewNews ) ;
@@ -67,8 +67,8 @@ export function Sidebar() {
6767 setBadgeVisible ( false ) ;
6868 } ;
6969
70- const roleVal = normalizePermissionRole ( ( user as any ) ? .role ) ;
71- const isAdmin = roleVal === PermissionRole . ADMIN ;
70+ const roleVal = user . role ;
71+ const isAdmin = roleVal === GamevaultUserRoleEnum . NUMBER_3 ;
7272
7373 return (
7474 < >
@@ -204,7 +204,7 @@ export function Sidebar() {
204204 { showEditProfile && user && (
205205 < UserEditorModal
206206 self
207- user = { user as any }
207+ user = { user }
208208 onClose = { ( ) => setShowEditProfile ( false ) }
209209 />
210210 ) }
0 commit comments