watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-12 16:45:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

More refactoring.

Browse source
This commit is contained in:
Mike Cao 2023-01-30 21:44:07 -08:00
parent 5f15ad0807
commit 02a1438cfe
41 changed files with 196 additions and 721 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pages/console/[[...id]].js
View file

@ -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;
}

2
pages/settings/teams/[...id].js
View file

@ -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;

2
pages/settings/teams/index.js
View file

@ -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;

2
pages/settings/users/[...id].js
View file

@ -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;

2
pages/settings/users/index.js
View file

@ -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) {

4
pages/settings/websites/[id]/index.js
View file

@ -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;
}

3
pages/sso.js
View file

@ -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" />;
}