From b405a0817faba70adc8e2f5c99364b303fc49f3a Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Sun, 12 Feb 2023 16:21:34 +0100 Subject: [PATCH] fix: Only show admin Page when user is admin; Remove Overview section --- src/routes/AuthenticatedRoute.tsx | 14 ++++++++------ src/routes/VerifyEmailRoute.tsx | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/routes/AuthenticatedRoute.tsx b/src/routes/AuthenticatedRoute.tsx index c7ac98a..3298168 100644 --- a/src/routes/AuthenticatedRoute.tsx +++ b/src/routes/AuthenticatedRoute.tsx @@ -11,15 +11,17 @@ import NavigationButton, { NavigationSection, } from "~/route-widgets/AuthenticateRoute/NavigationButton" -const sections = (Object.keys(NavigationSection) as Array).filter( - value => isNaN(Number(value)), -) - export default function AuthenticatedRoute(): ReactElement { const {t} = useTranslation() const theme = useTheme() + const user = useUser() - useUser() + const sections = [ + NavigationSection.Aliases, + NavigationSection.Reports, + NavigationSection.Settings, + user.isAdmin && NavigationSection.Admin, + ].filter(value => value !== false) as NavigationSection[] return ( @@ -50,7 +52,7 @@ export default function AuthenticatedRoute(): ReactElement { {sections.map(key => ( - + ))} diff --git a/src/routes/VerifyEmailRoute.tsx b/src/routes/VerifyEmailRoute.tsx index e143295..b5a8786 100644 --- a/src/routes/VerifyEmailRoute.tsx +++ b/src/routes/VerifyEmailRoute.tsx @@ -45,7 +45,6 @@ export default function VerifyEmailRoute(): ReactElement { verifyEmail, { onSuccess: ({user}) => { - setEmail("") login(user) navigate("/auth/complete-account") },