Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix user logic.

Mike Cao89f2fd601e35
diff --git a/pages/settings/index.js b/pages/settings/index.js
index fc0cc7c06..70e8d249d 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 3d03b71d1..5f34aa711 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 (
<AppLayout>
<TeamSettings teamId={id} />
diff --git a/pages/settings/teams/index.js b/pages/settings/teams/index.js
index 4484ab49e..a159d6e39 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 (
<AppLayout>
<TeamsList />
diff --git a/pages/settings/users/[...id].js b/pages/settings/users/[...id].js
index 90d6d778d..d0b79f013 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 (
<AppLayout>
<UserSettings userId={id} />
diff --git a/pages/settings/users/index.js b/pages/settings/users/index.js
index 4f2218337..272e166cf 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;
}