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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
add cloud_mode
Brian Caodb1ae3f2c79b
diff --git a/components/layout/Header.js b/components/layout/Header.jsindex 84c3d88b7..9e7dda3db 100644--- a/components/layout/Header.js+++ b/components/layout/Header.js@@ -14,7 +14,7 @@ import useUser from 'hooks/useUser';import Logo from 'assets/logo.svg';import styles from './Header.module.css';-export default function Header() {+export default function Header({ settingsDisabled }) {const { user } = useUser();const { pathname } = useRouter();const { updatesDisabled } = useConfig();@@ -38,15 +38,17 @@ export default function Header() {<Link href="/realtime"><FormattedMessage id="label.realtime" defaultMessage="Realtime" /></Link>- <Link href="/settings">- <FormattedMessage id="label.settings" defaultMessage="Settings" />- </Link>+ {!settingsDisabled && (+ <Link href="/settings">+ <FormattedMessage id="label.settings" defaultMessage="Settings" />+ </Link>+ )}</div>)}<div className={styles.buttons}><ThemeButton /><LanguageButton menuAlign="right" />- {user && <UserButton />}+ {user && <UserButton settingsDisabled={settingsDisabled} />}</div></header></>diff --git a/components/layout/Layout.js b/components/layout/Layout.jsindex 2c097e412..51829dfdd 100644--- a/components/layout/Layout.js+++ b/components/layout/Layout.js@@ -4,7 +4,13 @@ import Header from 'components/layout/Header';import Footer from 'components/layout/Footer';import useLocale from 'hooks/useLocale';-export default function Layout({ title, children, header = true, footer = true }) {+export default function Layout({+ title,+ children,+ header = true,+ footer = true,+ settingsDisabled = false,+}) {const { dir } = useLocale();return (@@ -13,7 +19,7 @@ export default function Layout({ title, children, header = true, footer = true }<title>umami{title && ` - ${title}`}</title></Head>- {header && <Header />}+ {header && <Header settingsDisabled={settingsDisabled} />}<main>{children}</main>{footer && <Footer />}<div id="__modals" dir={dir} />diff --git a/components/settings/UserButton.js b/components/settings/UserButton.jsindex 8e0ee3503..36c0a2e50 100644--- a/components/settings/UserButton.js+++ b/components/settings/UserButton.js@@ -9,7 +9,7 @@ import styles from './UserButton.module.css';import { AUTH_TOKEN } from 'lib/constants';import useUser from 'hooks/useUser';-export default function UserButton() {+export default function UserButton({ settingsDisabled }) {const { user } = useUser();const router = useRouter();@@ -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: settingsDisabled,+ },{ label: <FormattedMessage id="label.logout" defaultMessage="Logout" />, value: 'logout' },];diff --git a/pages/404.js b/pages/404.jsindex 4c85b10a5..fd303bff0 100644--- a/pages/404.js+++ b/pages/404.js@@ -2,9 +2,9 @@ import React from 'react';import Layout from 'components/layout/Layout';import { FormattedMessage } from 'react-intl';-export default function Custom404() {+export default function Custom404({ settingsDisabled }) {return (- <Layout>+ <Layout settingsDisabled={settingsDisabled}><div className="row justify-content-center"><h1><FormattedMessage id="message.page-not-found" defaultMessage="Page not found" />@@ -13,3 +13,11 @@ export default function Custom404() {</Layout>);}++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}diff --git a/pages/console/[[...id]].js b/pages/console/[[...id]].jsindex a13537f85..3f1d82830 100644--- a/pages/console/[[...id]].js+++ b/pages/console/[[...id]].js@@ -4,7 +4,7 @@ import TestConsole from 'components/pages/TestConsole';import useRequireLogin from 'hooks/useRequireLogin';import useUser from 'hooks/useUser';-export default function ConsolePage({ enabled }) {+export default function ConsolePage({ enabled, settingsDisabled }) {const { loading } = useRequireLogin();const { user } = useUser();@@ -13,7 +13,7 @@ export default function ConsolePage({ enabled }) {}return (- <Layout>+ <Layout settingsDisabled={settingsDisabled}><TestConsole /></Layout>);diff --git a/pages/dashboard/[[...id]].js b/pages/dashboard/[[...id]].jsindex 452a425e8..5a6024f4c 100644--- a/pages/dashboard/[[...id]].js+++ b/pages/dashboard/[[...id]].js@@ -3,7 +3,7 @@ import Layout from 'components/layout/Layout';import Dashboard from 'components/pages/Dashboard';import useRequireLogin from 'hooks/useRequireLogin';-export default function DashboardPage() {+export default function DashboardPage({ settingsDisabled }) {const { loading } = useRequireLogin();if (loading) {@@ -11,8 +11,16 @@ export default function DashboardPage() {}return (- <Layout>+ <Layout settingsDisabled={settingsDisabled}><Dashboard /></Layout>);}++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}diff --git a/pages/login.js b/pages/login.jsindex 4856a7725..7e815d53b 100644--- 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.CLOUD_MODE },};}diff --git a/pages/realtime.js b/pages/realtime.jsindex 9f1ebffab..2b96a8ddc 100644--- a/pages/realtime.js+++ b/pages/realtime.js@@ -3,7 +3,7 @@ import Layout from 'components/layout/Layout';import RealtimeDashboard from 'components/pages/RealtimeDashboard';import useRequireLogin from 'hooks/useRequireLogin';-export default function RealtimePage() {+export default function RealtimePage({ settingsDisabled }) {const { loading } = useRequireLogin();if (loading) {@@ -11,8 +11,16 @@ export default function RealtimePage() {}return (- <Layout>+ <Layout settingsDisabled={settingsDisabled}><RealtimeDashboard /></Layout>);}++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}diff --git a/pages/settings/accounts.js b/pages/settings/accounts.jsindex 3426f4b8c..f7ee46d31 100644--- a/pages/settings/accounts.js+++ b/pages/settings/accounts.js@@ -1,3 +1,11 @@import Index from './index';export default Index;++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}diff --git a/pages/settings/index.js b/pages/settings/index.jsindex b4bb22483..71c7bd731 100644--- a/pages/settings/index.js+++ b/pages/settings/index.js@@ -3,16 +3,26 @@ import Layout from 'components/layout/Layout';import Settings from 'components/pages/Settings';import useRequireLogin from 'hooks/useRequireLogin';-export default function SettingsPage() {+export default function SettingsPage({ settingsDisabled }) {const { loading } = useRequireLogin();- if (loading) {+ if (settingsDisabled || loading) {return null;}return (- <Layout>+ <Layout settingsDisabled={settingsDisabled}>+ TEST TEST TEST+ {settingsDisabled}<Settings /></Layout>);}++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}diff --git a/pages/settings/profile.js b/pages/settings/profile.jsindex 3426f4b8c..f7ee46d31 100644--- a/pages/settings/profile.js+++ b/pages/settings/profile.js@@ -1,3 +1,11 @@import Index from './index';export default Index;++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}diff --git a/pages/share/[...id].js b/pages/share/[...id].jsindex ff5e4a6e6..c1a534b99 100644--- a/pages/share/[...id].js+++ b/pages/share/[...id].js@@ -4,7 +4,7 @@ import Layout from 'components/layout/Layout';import WebsiteDetails from 'components/pages/WebsiteDetails';import useShareToken from 'hooks/useShareToken';-export default function SharePage() {+export default function SharePage({ settingsDisabled }) {const router = useRouter();const { id } = router.query;const shareId = id?.[0];@@ -17,8 +17,16 @@ export default function SharePage() {const { websiteId } = shareToken;return (- <Layout>+ <Layout settingsDisabled={settingsDisabled}><WebsiteDetails websiteId={websiteId} /></Layout>);}++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}diff --git a/pages/websites/[...id].js b/pages/websites/[...id].jsindex 90f4f492c..f498987b9 100644--- a/pages/websites/[...id].js+++ b/pages/websites/[...id].js@@ -4,7 +4,7 @@ import Layout from 'components/layout/Layout';import WebsiteDetails from 'components/pages/WebsiteDetails';import useRequireLogin from 'hooks/useRequireLogin';-export default function DetailsPage() {+export default function DetailsPage({ settingsDisabled }) {const { loading } = useRequireLogin();const router = useRouter();const { id } = router.query;@@ -16,8 +16,16 @@ export default function DetailsPage() {const [websiteId] = id;return (- <Layout>+ <Layout settingsDisabled={settingsDisabled}><WebsiteDetails websiteId={websiteId} /></Layout>);}++export async function getServerSideProps() {+ return {+ props: {+ settingsDisabled: !!process.env.CLOUD_MODE,+ },+ };+}