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

add cloud_mode
This commit is contained in:
Mike Cao 2022-10-12 17:33:54 -07:00 committed by GitHub
commit 6147c3502a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 12 deletions

View File

@ -38,9 +38,11 @@ export default function Header() {
<Link href="/realtime"> <Link href="/realtime">
<FormattedMessage id="label.realtime" defaultMessage="Realtime" /> <FormattedMessage id="label.realtime" defaultMessage="Realtime" />
</Link> </Link>
<Link href="/settings"> {!process.env.isCloudMode && (
<FormattedMessage id="label.settings" defaultMessage="Settings" /> <Link href="/settings">
</Link> <FormattedMessage id="label.settings" defaultMessage="Settings" />
</Link>
)}
</div> </div>
)} )}
<div className={styles.buttons}> <div className={styles.buttons}>

View File

@ -25,7 +25,11 @@ export default function UserButton() {
value: 'username', value: 'username',
className: styles.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' }, { label: <FormattedMessage id="label.logout" defaultMessage="Logout" />, value: 'logout' },
]; ];

View File

@ -36,6 +36,7 @@ module.exports = {
env: { env: {
currentVersion: pkg.version, currentVersion: pkg.version,
isProduction: process.env.NODE_ENV === 'production', isProduction: process.env.NODE_ENV === 'production',
isCloudMode: process.env.CLOUD_MODE,
}, },
basePath: process.env.BASE_PATH, basePath: process.env.BASE_PATH,
output: 'standalone', output: 'standalone',

View File

@ -18,9 +18,3 @@ export default function ConsolePage({ enabled }) {
</Layout> </Layout>
); );
} }
export async function getServerSideProps() {
return {
props: { enabled: !!process.env.ENABLE_TEST_CONSOLE },
};
}

View File

@ -16,6 +16,6 @@ export default function LoginPage({ loginDisabled }) {
export async function getServerSideProps() { export async function getServerSideProps() {
return { return {
props: { loginDisabled: !!process.env.DISABLE_LOGIN }, props: { loginDisabled: !!process.env.DISABLE_LOGIN || process.env.isCloudMode },
}; };
} }

View File

@ -6,7 +6,7 @@ import useRequireLogin from 'hooks/useRequireLogin';
export default function SettingsPage() { export default function SettingsPage() {
const { loading } = useRequireLogin(); const { loading } = useRequireLogin();
if (loading) { if (process.env.isCloudMode || loading) {
return null; return null;
} }