Merge pull request umami-software#1567 from umami-software/feat/um-69…

…-nice add cloud_mode
lelas · Oct 13, 2022 · 6147c35 · 6147c35
2 parents e429abc + 9e8748e
commit 6147c35
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/components/layout/Header.js b/components/layout/Header.js
@@ -38,9 +38,11 @@ export default function Header() {
             <Link href="/realtime">
               <FormattedMessage id="label.realtime" defaultMessage="Realtime" />
             </Link>
-            <Link href="/settings">
-              <FormattedMessage id="label.settings" defaultMessage="Settings" />
-            </Link>
+            {!process.env.isCloudMode && (
+              <Link href="/settings">
+                <FormattedMessage id="label.settings" defaultMessage="Settings" />
+              </Link>
+            )}
           </div>
         )}
         <div className={styles.buttons}>

diff --git a/components/settings/UserButton.js b/components/settings/UserButton.js
@@ -25,7 +25,11 @@ export default function UserButton() {
       value: 'username',
       className: styles.username,
     },
-    { label: <FormattedMessage id="label.profile" defaultMessage="Profile" />, value: 'profile' },
+    {
+      label: <FormattedMessage id="label.profile" defaultMessage="Profile" />,
+      value: 'profile',
+      hidden: process.env.isCloudMode,
+    },
     { label: <FormattedMessage id="label.logout" defaultMessage="Logout" />, value: 'logout' },
   ];
 

diff --git a/next.config.js b/next.config.js
@@ -36,6 +36,7 @@ module.exports = {
   env: {
     currentVersion: pkg.version,
     isProduction: process.env.NODE_ENV === 'production',
+    isCloudMode: process.env.CLOUD_MODE,
   },
   basePath: process.env.BASE_PATH,
   output: 'standalone',

diff --git a/pages/console/[[...id]].js b/pages/console/[[...id]].js
@@ -18,9 +18,3 @@ export default function ConsolePage({ enabled }) {
     </Layout>
   );
 }
-
-export async function getServerSideProps() {
-  return {
-    props: { enabled: !!process.env.ENABLE_TEST_CONSOLE },
-  };
-}
diff --git a/pages/login.js b/pages/login.js
@@ -16,6 +16,6 @@ export default function LoginPage({ loginDisabled }) {
 
 export async function getServerSideProps() {
   return {
-    props: { loginDisabled: !!process.env.DISABLE_LOGIN },
+    props: { loginDisabled: !!process.env.DISABLE_LOGIN || process.env.isCloudMode },
   };
 }
diff --git a/pages/settings/index.js b/pages/settings/index.js
@@ -6,7 +6,7 @@ import useRequireLogin from 'hooks/useRequireLogin';
 export default function SettingsPage() {
   const { loading } = useRequireLogin();
 
-  if (loading) {
+  if (process.env.isCloudMode || loading) {
     return null;
   }