m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix user logic.

Browse Source
This commit is contained in:
Mike Cao 2023-01-30 23:03:08 -08:00
parent 02a1438cfe
commit 89f2fd601e
5 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/settings/index.js
View File

@ -3,7 +3,7 @@ export default () => null;
export async function getServerSideProps() { export async function getServerSideProps() {
return { return {
redirect: { redirect: {
destination: '/buttons/websites', destination: '/settings/websites',
permanent: true, permanent: true,
}, },
}; };

6
pages/settings/teams/[...id].js
View File

@ -1,17 +1,11 @@
import AppLayout from 'components/layout/AppLayout'; import AppLayout from 'components/layout/AppLayout';
import TeamSettings from 'components/pages/settings/teams/TeamSettings'; import TeamSettings from 'components/pages/settings/teams/TeamSettings';
import useUser from 'hooks/useUser';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
export default function TeamDetailPage() { export default function TeamDetailPage() {
const { user } = useUser();
const router = useRouter(); const router = useRouter();
const { id } = router.query; const { id } = router.query;
if (!user) {
return null;
}
return ( return (
<AppLayout> <AppLayout>
<TeamSettings teamId={id} /> <TeamSettings teamId={id} />

7
pages/settings/teams/index.js
View File

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

6
pages/settings/users/[...id].js
View File

@ -1,17 +1,11 @@
import AppLayout from 'components/layout/AppLayout'; import AppLayout from 'components/layout/AppLayout';
import UserSettings from 'components/pages/settings/users/UserSettings'; import UserSettings from 'components/pages/settings/users/UserSettings';
import useUser from 'hooks/useUser';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
export default function TeamDetailPage() { export default function TeamDetailPage() {
const { user } = useUser();
const router = useRouter(); const router = useRouter();
const { id } = router.query; const { id } = router.query;
if (!user) {
return null;
}
return ( return (
<AppLayout> <AppLayout>
<UserSettings userId={id} /> <UserSettings userId={id} />

4
pages/settings/users/index.js
View File

@ -1,14 +1,12 @@
import AppLayout from 'components/layout/AppLayout'; import AppLayout from 'components/layout/AppLayout';
import useConfig from 'hooks/useConfig'; import useConfig from 'hooks/useConfig';
import useUser from 'hooks/useUser';
import UsersList from 'components/pages/settings/users/UsersList'; import UsersList from 'components/pages/settings/users/UsersList';
export default function UsersPage() { export default function UsersPage() {
const { user } = useUser();
const { adminDisabled } = useConfig(); const { adminDisabled } = useConfig();
if (adminDisabled || !user) { if (adminDisabled) {
return null; return null;
} }