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

Updated login and layout pages.

Browse source
This commit is contained in:
Mike Cao 2023-01-11 14:47:38 -08:00
parent 9d967fb0fe
commit 4f15c4f146
18 changed files with 103 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pages/404.js
View file

@ -1,4 +1,4 @@
import Layout from 'components/layout/Layout';
import AppLayout from 'components/layout/AppLayout';
import { useIntl, defineMessages } from 'react-intl';
const messages = defineMessages({
@ -9,10 +9,10 @@ export default function Custom404() {
const { formatMessage } = useIntl();
return (
<Layout>
<AppLayout>
<div className="row justify-content-center">
<h1 style={{ textAlign: 'center' }}>{formatMessage(messages.notFound)}</h1>
</div>
</Layout>
</AppLayout>
);
}

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

@ -1,18 +1,18 @@
import Layout from 'components/layout/Layout';
import AppLayout from 'components/layout/AppLayout';
import TestConsole from 'components/pages/console/TestConsole';
import useRequireLogin from 'hooks/useRequireLogin';
import useUser from 'hooks/useUser';
export default function ConsolePage({ pageDisabled }) {
const { user } = useRequireLogin();
const { user } = useUser();
if (pageDisabled || !user || !user.isAdmin) {
return null;
}
return (
<Layout>
<AppLayout>
<TestConsole />
</Layout>
</AppLayout>
);
}

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

@ -1,27 +1,10 @@
import { useRouter } from 'next/router';
import Layout from 'components/layout/Layout';
import AppLayout from 'components/layout/AppLayout';
import Dashboard from 'components/pages/dashboard/Dashboard';
import useConfig from 'hooks/useConfig';
import useRequireLogin from 'hooks/useRequireLogin';
export default function DashboardPage() {
const {
query: { id },
isReady,
asPath,
} = useRouter();
const { user } = useRequireLogin();
const { adminDisabled } = useConfig();
if (adminDisabled || !user || !isReady) {
return null;
}
const userId = id?.[0];
return (
<Layout>
<Dashboard key={asPath} userId={user.id || userId} />
</Layout>
<AppLayout>
<Dashboard />
</AppLayout>
);
}

6
pages/login.js
View file

@ -1,4 +1,4 @@
import Layout from 'components/layout/Layout';
import LoginLayout from 'components/pages/login/LoginLayout';
import LoginForm from 'components/pages/login/LoginForm';
export default function LoginPage({ pageDisabled }) {
@ -7,9 +7,9 @@ export default function LoginPage({ pageDisabled }) {
}
return (
<Layout title="login" header={false} footer={false} center>
<LoginLayout title="login">
<LoginForm />
</Layout>
</LoginLayout>
);
}

13
pages/realtime.js
View file

@ -1,17 +1,10 @@
import Layout from 'components/layout/Layout';
import AppLayout from 'components/layout/AppLayout';
import RealtimeDashboard from 'components/pages/realtime/RealtimeDashboard';
import useRequireLogin from 'hooks/useRequireLogin';
export default function RealtimePage() {
const { user } = useRequireLogin();
if (!user) {
return null;
}
return (
<Layout>
<AppLayout>
<RealtimeDashboard />
</Layout>
</AppLayout>
);
}

9
pages/settings/websites/index.js
View file

@ -1,16 +1,7 @@
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import useConfig from 'hooks/useConfig';
import useRequireLogin from 'hooks/useRequireLogin';
import WebsitesList from 'components/pages/settings/websites/WebsitesList';
export default function WebsitesPage() {
const { user } = useRequireLogin();
const { adminDisabled } = useConfig();
if (adminDisabled || !user) {
return null;
}
return (
<SettingsLayout>
<WebsitesList />

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

@ -1,5 +1,5 @@
import { useRouter } from 'next/router';
import Layout from 'components/layout/Layout';
import AppLayout from 'components/layout/AppLayout';
import WebsiteDetails from 'components/pages/websites/WebsiteDetails';
import useShareToken from 'hooks/useShareToken';
@ -14,8 +14,8 @@ export default function SharePage() {
}
return (
<Layout>
<AppLayout>
<WebsiteDetails websiteId={shareToken.websiteId} />
</Layout>
</AppLayout>
);
}

10
pages/websites/[id]/index.js
View file

@ -1,20 +1,18 @@
import { useRouter } from 'next/router';
import Layout from 'components/layout/Layout';
import AppLayout from 'components/layout/AppLayout';
import WebsiteDetails from 'components/pages/websites/WebsiteDetails';
import useRequireLogin from 'hooks/useRequireLogin';
export default function DetailsPage() {
const { user } = useRequireLogin();
const router = useRouter();
const { id } = router.query;
if (!id || !user) {
if (!id) {
return null;
}
return (
<Layout>
<AppLayout>
<WebsiteDetails websiteId={id} />
</Layout>
</AppLayout>
);
}