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 disable checks.

Browse Source
This commit is contained in:
Mike Cao 2022-10-28 10:34:50 -07:00
parent 98835bbc78
commit 246e4e5f4f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/layout/Header.js
View File

@ -30,7 +30,7 @@ export default function Header() {
<Link href={isSharePage ? HOMEPAGE_URL : '/'}>umami</Link> <Link href={isSharePage ? HOMEPAGE_URL : '/'}>umami</Link>
</div> </div>
<HamburgerButton /> <HamburgerButton />
{user && ( {user && !adminDisabled && (
<div className={styles.links}> <div className={styles.links}>
<Link href="/dashboard"> <Link href="/dashboard">
<FormattedMessage id="label.dashboard" defaultMessage="Dashboard" /> <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
@ -38,11 +38,9 @@ export default function Header() {
<Link href="/realtime"> <Link href="/realtime">
<FormattedMessage id="label.realtime" defaultMessage="Realtime" /> <FormattedMessage id="label.realtime" defaultMessage="Realtime" />
</Link> </Link>
{!adminDisabled && ( <Link href="/settings">
<Link href="/settings"> <FormattedMessage id="label.settings" defaultMessage="Settings" />
<FormattedMessage id="label.settings" defaultMessage="Settings" /> </Link>
</Link>
)}
</div> </div>
)} )}
<div className={styles.buttons}> <div className={styles.buttons}>

2
pages/_app.js
View File

@ -24,7 +24,7 @@ export default function App({ Component, pageProps }) {
const { basePath } = useRouter(); const { basePath } = useRouter();
const { dir } = useLocale(); const { dir } = useLocale();
if (!process.env.uiDisabled) { if (process.env.uiDisabled) {
return null; return null;
} }

6
pages/dashboard/[[...id]].js
View File

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

2
pages/login.js
View File

@ -17,7 +17,7 @@ export default function LoginPage({ pageDisabled }) {
export async function getServerSideProps() { export async function getServerSideProps() {
return { return {
props: { props: {
pageDisabled: !!(process.env.DISABLE_LOGIN || process.env.DISABLE_ADMIN), pageDisabled: !!process.env.DISABLE_LOGIN,
}, },
}; };
} }