From 89f2fd601e35d1f79c13fed43e5195c9927c8d75 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Mon, 30 Jan 2023 23:03:08 -0800 Subject: [PATCH] Fix user logic. --- pages/settings/index.js | 2 +- pages/settings/teams/[...id].js | 6 ------ pages/settings/teams/index.js | 7 ------- pages/settings/users/[...id].js | 6 ------ pages/settings/users/index.js | 4 +--- 5 files changed, 2 insertions(+), 23 deletions(-) diff --git a/pages/settings/index.js b/pages/settings/index.js index fc0cc7c0..70e8d249 100644 --- a/pages/settings/index.js +++ b/pages/settings/index.js @@ -3,7 +3,7 @@ export default () => null; export async function getServerSideProps() { return { redirect: { - destination: '/buttons/websites', + destination: '/settings/websites', permanent: true, }, }; diff --git a/pages/settings/teams/[...id].js b/pages/settings/teams/[...id].js index 3d03b71d..5f34aa71 100644 --- a/pages/settings/teams/[...id].js +++ b/pages/settings/teams/[...id].js @@ -1,17 +1,11 @@ import AppLayout from 'components/layout/AppLayout'; import TeamSettings from 'components/pages/settings/teams/TeamSettings'; -import useUser from 'hooks/useUser'; import { useRouter } from 'next/router'; export default function TeamDetailPage() { - const { user } = useUser(); const router = useRouter(); const { id } = router.query; - if (!user) { - return null; - } - return ( diff --git a/pages/settings/teams/index.js b/pages/settings/teams/index.js index 4484ab49..a159d6e3 100644 --- a/pages/settings/teams/index.js +++ b/pages/settings/teams/index.js @@ -1,14 +1,7 @@ import AppLayout from 'components/layout/AppLayout'; import TeamsList from 'components/pages/settings/teams/TeamsList'; -import useUser from 'hooks/useUser'; export default function TeamsPage() { - const { user } = useUser(); - - if (!user) { - return null; - } - return ( diff --git a/pages/settings/users/[...id].js b/pages/settings/users/[...id].js index 90d6d778..d0b79f01 100644 --- a/pages/settings/users/[...id].js +++ b/pages/settings/users/[...id].js @@ -1,17 +1,11 @@ import AppLayout from 'components/layout/AppLayout'; import UserSettings from 'components/pages/settings/users/UserSettings'; -import useUser from 'hooks/useUser'; import { useRouter } from 'next/router'; export default function TeamDetailPage() { - const { user } = useUser(); const router = useRouter(); const { id } = router.query; - if (!user) { - return null; - } - return ( diff --git a/pages/settings/users/index.js b/pages/settings/users/index.js index 4f221833..272e166c 100644 --- a/pages/settings/users/index.js +++ b/pages/settings/users/index.js @@ -1,14 +1,12 @@ import AppLayout from 'components/layout/AppLayout'; import useConfig from 'hooks/useConfig'; -import useUser from 'hooks/useUser'; import UsersList from 'components/pages/settings/users/UsersList'; export default function UsersPage() { - const { user } = useUser(); const { adminDisabled } = useConfig(); - if (adminDisabled || !user) { + if (adminDisabled) { return null; }