watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

checkpoint

Browse source
This commit is contained in:
Brian Cao 2022-10-12 16:29:44 -07:00
parent db1ae3f2c7
commit 9e8748e2f3
14 changed files with 24 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pages/404.js
View file

@ -2,9 +2,9 @@ import React from 'react';
import Layout from 'components/layout/Layout';
import { FormattedMessage } from 'react-intl';
export default function Custom404({ settingsDisabled }) {
export default function Custom404() {
return (
<Layout settingsDisabled={settingsDisabled}>
<Layout>
<div className="row justify-content-center">
<h1>
<FormattedMessage id="message.page-not-found" defaultMessage="Page not found" />
@ -13,11 +13,3 @@ export default function Custom404({ settingsDisabled }) {
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}

10
pages/console/[[...id]].js
View file

@ -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, settingsDisabled }) {
export default function ConsolePage({ enabled }) {
const { loading } = useRequireLogin();
const { user } = useUser();
@ -13,14 +13,8 @@ export default function ConsolePage({ enabled, settingsDisabled }) {
}
return (
<Layout settingsDisabled={settingsDisabled}>
<Layout>
<TestConsole />
</Layout>
);
}
export async function getServerSideProps() {
return {
props: { enabled: !!process.env.ENABLE_TEST_CONSOLE },
};
}

12
pages/dashboard/[[...id]].js
View file

@ -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({ settingsDisabled }) {
export default function DashboardPage() {
const { loading } = useRequireLogin();
if (loading) {
@ -11,16 +11,8 @@ export default function DashboardPage({ settingsDisabled }) {
}
return (
<Layout settingsDisabled={settingsDisabled}>
<Layout>
<Dashboard />
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}

2
pages/login.js
View file

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

12
pages/realtime.js
View file

@ -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({ settingsDisabled }) {
export default function RealtimePage() {
const { loading } = useRequireLogin();
if (loading) {
@ -11,16 +11,8 @@ export default function RealtimePage({ settingsDisabled }) {
}
return (
<Layout settingsDisabled={settingsDisabled}>
<Layout>
<RealtimeDashboard />
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}

8
pages/settings/accounts.js
View file

@ -1,11 +1,3 @@
import Index from './index';
export default Index;
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}

16
pages/settings/index.js
View file

@ -3,26 +3,16 @@ import Layout from 'components/layout/Layout';
import Settings from 'components/pages/Settings';
import useRequireLogin from 'hooks/useRequireLogin';
export default function SettingsPage({ settingsDisabled }) {
export default function SettingsPage() {
const { loading } = useRequireLogin();
if (settingsDisabled || loading) {
if (process.env.isCloudMode || loading) {
return null;
}
return (
<Layout settingsDisabled={settingsDisabled}>
TEST TEST TEST
{settingsDisabled}
<Layout>
<Settings />
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}

8
pages/settings/profile.js
View file

@ -1,11 +1,3 @@
import Index from './index';
export default Index;
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}

12
pages/share/[...id].js
View file

@ -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({ settingsDisabled }) {
export default function SharePage() {
const router = useRouter();
const { id } = router.query;
const shareId = id?.[0];
@ -17,16 +17,8 @@ export default function SharePage({ settingsDisabled }) {
const { websiteId } = shareToken;
return (
<Layout settingsDisabled={settingsDisabled}>
<Layout>
<WebsiteDetails websiteId={websiteId} />
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}

12
pages/websites/[...id].js
View file

@ -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({ settingsDisabled }) {
export default function DetailsPage() {
const { loading } = useRequireLogin();
const router = useRouter();
const { id } = router.query;
@ -16,16 +16,8 @@ export default function DetailsPage({ settingsDisabled }) {
const [websiteId] = id;
return (
<Layout settingsDisabled={settingsDisabled}>
<Layout>
<WebsiteDetails websiteId={websiteId} />
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
settingsDisabled: !!process.env.CLOUD_MODE,
},
};
}