Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add cloud_mode #1567

Merged
merged 2 commits into from
Oct 13, 2022
Merged

add cloud_mode #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db1ae3f
add cloud_mode
briancao Oct 12, 2022
9e8748e
checkpoint
briancao Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions components/layout/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand Down
6 changes: 5 additions & 1 deletion components/settings/UserButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
];

Expand Down
1 change: 1 addition & 0 deletions next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 0 additions & 6 deletions pages/console/[[...id]].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,3 @@ export default function ConsolePage({ enabled }) {
</Layout>
);
}

export async function getServerSideProps() {
return {
props: { enabled: !!process.env.ENABLE_TEST_CONSOLE },
};
}
2 changes: 1 addition & 1 deletion pages/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
};
}
2 changes: 1 addition & 1 deletion pages/settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down