watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactor env check.

Browse source
This commit is contained in:
Mike Cao 2022-10-27 16:42:57 -07:00
parent ba63991a92
commit fc9584eb44
14 changed files with 30 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pages/_app.js
View file

@ -2,6 +2,7 @@ import Head from 'next/head';
import { useRouter } from 'next/router';
import { IntlProvider } from 'react-intl';
import useLocale from 'hooks/useLocale';
import useConfig from 'hooks/useConfig';
import 'styles/variables.css';
import 'styles/bootstrap-grid.css';
import 'styles/index.css';
@ -23,6 +24,11 @@ const Intl = ({ children }) => {
export default function App({ Component, pageProps }) {
const { basePath } = useRouter();
const { dir } = useLocale();
const { uiDisabled } = useConfig();
if (uiDisabled) {
return null;
}
return (
<Intl>

3
pages/api/config.js
View file

@ -7,6 +7,9 @@ export default async (req, res) => {
trackerScriptName: process.env.TRACKER_SCRIPT_NAME,
updatesDisabled: !!process.env.DISABLE_UPDATES,
telemetryDisabled: !!process.env.DISABLE_TELEMETRY,
loginDisabled: !!process.env.DISABLE_LOGIN,
adminDisabled: !!process.env.DISABLE_ADMIN,
uiDisabled: !!process.env.DISABLE_UI,
});
}

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

@ -4,11 +4,11 @@ import TestConsole from 'components/pages/TestConsole';
import useRequireLogin from 'hooks/useRequireLogin';
import useUser from 'hooks/useUser';
export default function ConsolePage({ enabled, pageDisabled }) {
export default function ConsolePage({ pageDisabled }) {
const { loading } = useRequireLogin();
const { user } = useUser();
if (pageDisabled || loading || !enabled || !user?.isAdmin) {
if (pageDisabled || loading || !user?.isAdmin) {
return null;
}
@ -22,8 +22,7 @@ export default function ConsolePage({ enabled, pageDisabled }) {
export async function getServerSideProps() {
return {
props: {
pageDisabled: !!process.env.DISABLE_UI,
enabled: !!process.env.ENABLE_TEST_CONSOLE,
pageDisabled: !process.env.ENABLE_TEST_CONSOLE,
},
};
}

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

@ -5,7 +5,7 @@ import useRequireLogin from 'hooks/useRequireLogin';
import { useRouter } from 'next/router';
import useUser from 'hooks/useUser';
export default function DashboardPage({ pageDisabled }) {
export default function DashboardPage() {
const {
query: { id },
isReady,
@ -14,7 +14,7 @@ export default function DashboardPage({ pageDisabled }) {
const { loading } = useRequireLogin();
const user = useUser();
if (pageDisabled || !user || !isReady || loading) {
if (!user || !isReady || loading) {
return null;
}
@ -26,11 +26,3 @@ export default function DashboardPage({ pageDisabled }) {
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
pageDisabled: !!process.env.DISABLE_UI,
},
};
}

3
pages/login.js
View file

@ -17,8 +17,7 @@ export default function LoginPage({ pageDisabled }) {
export async function getServerSideProps() {
return {
props: {
pageDisabled:
!!process.env.DISABLE_LOGIN || !!process.env.DISABLE_UI || !!process.env.isAdminDisabled,
pageDisabled: !!(process.env.DISABLE_LOGIN || process.env.DISABLE_ADMIN),
},
};
}

12
pages/realtime.js
View file

@ -3,10 +3,10 @@ import Layout from 'components/layout/Layout';
import RealtimeDashboard from 'components/pages/RealtimeDashboard';
import useRequireLogin from 'hooks/useRequireLogin';
export default function RealtimePage({ pageDisabled }) {
export default function RealtimePage() {
const { loading } = useRequireLogin();
if (pageDisabled || loading) {
if (loading) {
return null;
}
@ -16,11 +16,3 @@ export default function RealtimePage({ pageDisabled }) {
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
pageDisabled: !!process.env.DISABLE_UI,
},
};
}

8
pages/settings/accounts.js
View file

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

14
pages/settings/index.js
View file

@ -2,11 +2,13 @@ import React from 'react';
import Layout from 'components/layout/Layout';
import Settings from 'components/pages/Settings';
import useRequireLogin from 'hooks/useRequireLogin';
import useConfig from 'hooks/useConfig';
export default function SettingsPage({ pageDisabled }) {
export default function SettingsPage() {
const { loading } = useRequireLogin();
const { adminDisabled } = useConfig();
if (pageDisabled || loading) {
if (adminDisabled || loading) {
return null;
}
@ -16,11 +18,3 @@ export default function SettingsPage({ pageDisabled }) {
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
pageDisabled: !!process.env.DISABLE_UI || !!process.env.isAdminDisabled,
},
};
}

8
pages/settings/profile.js
View file

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

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

@ -4,13 +4,13 @@ import Layout from 'components/layout/Layout';
import WebsiteDetails from 'components/pages/WebsiteDetails';
import useShareToken from 'hooks/useShareToken';
export default function SharePage({ pageDisabled }) {
export default function SharePage() {
const router = useRouter();
const { id } = router.query;
const shareId = id?.[0];
const shareToken = useShareToken(shareId);
if (pageDisabled || !shareToken) {
if (!shareToken) {
return null;
}
@ -20,11 +20,3 @@ export default function SharePage({ pageDisabled }) {
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
pageDisabled: !!process.env.DISABLE_UI,
},
};
}

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

@ -4,12 +4,12 @@ import Layout from 'components/layout/Layout';
import WebsiteDetails from 'components/pages/WebsiteDetails';
import useRequireLogin from 'hooks/useRequireLogin';
export default function DetailsPage({ pageDisabled }) {
export default function DetailsPage() {
const { loading } = useRequireLogin();
const router = useRouter();
const { id } = router.query;
if (pageDisabled || !id || loading) {
if (!id || loading) {
return null;
}
@ -21,11 +21,3 @@ export default function DetailsPage({ pageDisabled }) {
</Layout>
);
}
export async function getServerSideProps() {
return {
props: {
pageDisabled: !!process.env.DISABLE_UI,
},
};
}