watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updated login check method.

Browse source
This commit is contained in:
Mike Cao 2023-01-04 21:20:24 -08:00
parent 170b30b391
commit 796c65fa29
10 changed files with 45 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

4
pages/dashboard/[[...id]].js
View file

@ -1,8 +1,8 @@
import { useRouter } from 'next/router';
import Layout from 'components/layout/Layout';
import Dashboard from 'components/pages/Dashboard';
import useUser from 'hooks/useUser';
import useConfig from 'hooks/useConfig';
import useRequireLogin from 'hooks/useRequireLogin';
export default function DashboardPage() {
const {
@ -10,7 +10,7 @@ export default function DashboardPage() {
isReady,
asPath,
} = useRouter();
const user = useUser();
const { user } = useRequireLogin();
const { adminDisabled } = useConfig();
if (adminDisabled || !user || !isReady) {

4
pages/realtime.js
View file

@ -1,9 +1,9 @@
import Layout from 'components/layout/Layout';
import RealtimeDashboard from 'components/pages/RealtimeDashboard';
import useUser from 'hooks/useUser';
import useRequireLogin from 'hooks/useRequireLogin';
export default function RealtimePage() {
const user = useUser();
const { user } = useRequireLogin();
if (!user) {
return null;

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

@ -1,10 +1,10 @@
import { useRouter } from 'next/router';
import Layout from 'components/layout/Layout';
import WebsiteDetails from 'components/pages/WebsiteDetails';
import useUser from 'hooks/useUser';
import useRequireLogin from 'hooks/useRequireLogin';
export default function DetailsPage() {
const user = useUser();
const { user } = useRequireLogin();
const router = useRouter();
const { id } = router.query;

5
pages/websites/index.js
View file

@ -1,11 +1,10 @@
import Settings from 'components/pages/Settings';
import useConfig from 'hooks/useConfig';
import useUser from 'hooks/useUser';
import useRequireLogin from 'hooks/useRequireLogin';
import WebsitesList from 'components/pages/WebsitesList';
export default function WebsitesPage() {
const user = useUser();
const { user } = useRequireLogin();
const { adminDisabled } = useConfig();
if (adminDisabled || !user) {