More refactoring.

pages/console/[[...id]].js

@@ -1,11 +1,8 @@
 import AppLayout from 'components/layout/AppLayout';
 import TestConsole from 'components/pages/console/TestConsole';
-import useUser from 'hooks/useUser';
 
 export default function ConsolePage({ pageDisabled }) {
-  const { user } = useUser();
-
-  if (pageDisabled || !user || !user.isAdmin) {
+  if (pageDisabled) {
     return null;
   }
 

pages/settings/teams/[...id].js

@@ -4,7 +4,7 @@ import useUser from 'hooks/useUser';
 import { useRouter } from 'next/router';
 
 export default function TeamDetailPage() {
-  const user = useUser();
+  const { user } = useUser();
   const router = useRouter();
   const { id } = router.query;
 

pages/settings/teams/index.js

@@ -3,7 +3,7 @@ import TeamsList from 'components/pages/settings/teams/TeamsList';
 import useUser from 'hooks/useUser';
 
 export default function TeamsPage() {
-  const user = useUser();
+  const { user } = useUser();
 
   if (!user) {
     return null;

pages/settings/users/[...id].js

@@ -4,7 +4,7 @@ import useUser from 'hooks/useUser';
 import { useRouter } from 'next/router';
 
 export default function TeamDetailPage() {
-  const user = useUser();
+  const { user } = useUser();
   const router = useRouter();
   const { id } = router.query;
 

pages/settings/users/index.js

@@ -5,7 +5,7 @@ import useUser from 'hooks/useUser';
 import UsersList from 'components/pages/settings/users/UsersList';
 
 export default function UsersPage() {
-  const user = useUser();
+  const { user } = useUser();
   const { adminDisabled } = useConfig();
 
   if (adminDisabled || !user) {

pages/settings/websites/[id]/index.js

@@ -1,14 +1,12 @@
 import { useRouter } from 'next/router';
 import WebsiteSettings from 'components/pages/settings/websites/WebsiteSettings';
-import useUser from 'hooks/useUser';
 import AppLayout from 'components/layout/AppLayout';
 
 export default function WebsiteSettingsPage() {
-  const user = useUser();
   const router = useRouter();
   const { id } = router.query;
 
-  if (!id || !user) {
+  if (!id) {
     return null;
   }
 

pages/sso.js

@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+import { Loading } from 'react-basics';
 import { useRouter } from 'next/router';
 import { setClientAuthToken } from 'lib/client';
 
@@ -14,5 +15,5 @@ export default function SingleSignOnPage() {
     }
   }, [router, url, token]);
 
-  return null;
+  return <Loading size="xl" />;
 }