From 246e4e5f4ffcde63c81e0e1937797c24d50a3f02 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 28 Oct 2022 10:34:50 -0700
Subject: [PATCH] Fix disable checks.

---
 components/layout/Header.js  | 10 ++++------
 pages/_app.js                |  2 +-
 pages/dashboard/[[...id]].js |  6 ++++--
 pages/login.js               |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/components/layout/Header.js b/components/layout/Header.js
index 02a2e081..3fa71147 100644
--- a/components/layout/Header.js
+++ b/components/layout/Header.js
@@ -30,7 +30,7 @@ export default function Header() {
           <Link href={isSharePage ? HOMEPAGE_URL : '/'}>umami</Link>
         </div>
         <HamburgerButton />
-        {user && (
+        {user && !adminDisabled && (
           <div className={styles.links}>
             <Link href="/dashboard">
               <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
@@ -38,11 +38,9 @@ export default function Header() {
             <Link href="/realtime">
               <FormattedMessage id="label.realtime" defaultMessage="Realtime" />
             </Link>
-            {!adminDisabled && (
-              <Link href="/settings">
-                <FormattedMessage id="label.settings" defaultMessage="Settings" />
-              </Link>
-            )}
+            <Link href="/settings">
+              <FormattedMessage id="label.settings" defaultMessage="Settings" />
+            </Link>
           </div>
         )}
         <div className={styles.buttons}>
diff --git a/pages/_app.js b/pages/_app.js
index db4bb6e5..0d942f9d 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -24,7 +24,7 @@ export default function App({ Component, pageProps }) {
   const { basePath } = useRouter();
   const { dir } = useLocale();
 
-  if (!process.env.uiDisabled) {
+  if (process.env.uiDisabled) {
     return null;
   }
 
diff --git a/pages/dashboard/[[...id]].js b/pages/dashboard/[[...id]].js
index 7c762097..c9ef6231 100644
--- a/pages/dashboard/[[...id]].js
+++ b/pages/dashboard/[[...id]].js
@@ -1,9 +1,10 @@
 import React from 'react';
+import { useRouter } from 'next/router';
 import Layout from 'components/layout/Layout';
 import Dashboard from 'components/pages/Dashboard';
 import useRequireLogin from 'hooks/useRequireLogin';
-import { useRouter } from 'next/router';
 import useUser from 'hooks/useUser';
+import useConfig from 'hooks/useConfig';
 
 export default function DashboardPage() {
   const {
@@ -13,8 +14,9 @@ export default function DashboardPage() {
   } = useRouter();
   const { loading } = useRequireLogin();
   const user = useUser();
+  const { adminDisabled } = useConfig();
 
-  if (!user || !isReady || loading) {
+  if (adminDisabled || !user || !isReady || loading) {
     return null;
   }
 
diff --git a/pages/login.js b/pages/login.js
index 55b10427..fb2fcb21 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -17,7 +17,7 @@ export default function LoginPage({ pageDisabled }) {
 export async function getServerSideProps() {
   return {
     props: {
-      pageDisabled: !!(process.env.DISABLE_LOGIN || process.env.DISABLE_ADMIN),
+      pageDisabled: !!process.env.DISABLE_LOGIN,
     },
   };
 }