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

Implement react-basics styles. Fix queries.

Browse source
This commit is contained in:
Mike Cao 2022-12-08 23:43:43 -08:00
parent b57ecf33e6
commit 0a6ecfe3d2
59 changed files with 227 additions and 4336 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pages/_app.js
View file

@ -1,11 +1,9 @@
import Head from 'next/head';
import { useRouter } from 'next/router';
import { IntlProvider } from 'react-intl';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { Container } from 'react-basics';
import useLocale from 'hooks/useLocale';
import useConfig from 'hooks/useConfig';
import 'react-basics/dist/styles.css';
import 'styles/variables.css';
import 'styles/index.css';
import '@fontsource/inter/400.css';
import '@fontsource/inter/600.css';
@ -13,8 +11,7 @@ import '@fontsource/inter/600.css';
const client = new QueryClient();
export default function App({ Component, pageProps }) {
const { locale, messages, dir } = useLocale();
const { basePath } = useRouter();
const { locale, messages } = useLocale();
useConfig();
const Wrapper = ({ children }) => <span className={locale}>{children}</span>;
@ -26,21 +23,7 @@ export default function App({ Component, pageProps }) {
return (
<QueryClientProvider client={client}>
<IntlProvider locale={locale} messages={messages[locale]} textComponent={Wrapper}>
<Head>
<link rel="icon" href={`${basePath}/favicon.ico`} />
<link rel="apple-touch-icon" sizes="180x180" href={`${basePath}/apple-touch-icon.png`} />
<link rel="icon" type="image/png" sizes="32x32" href={`${basePath}/favicon-32x32.png`} />
<link rel="icon" type="image/png" sizes="16x16" href={`${basePath}/favicon-16x16.png`} />
<link rel="manifest" href={`${basePath}/site.webmanifest`} />
<link rel="mask-icon" href={`${basePath}/safari-pinned-tab.svg`} color="#5bbad5" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />
<meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
</Head>
<Container dir={dir}>
<Component {...pageProps} />
</Container>
<Component {...pageProps} />
</IntlProvider>
</QueryClientProvider>
);

2
pages/api/auth/login.ts
View file

@ -34,7 +34,7 @@ export default async (
return badRequest(res);
}
const user = await getUser({ username }, true);
const user = await getUser({ username }, { includePassword: true });
if (user && checkPassword(password, user.password)) {
if (redis.enabled) {

2
pages/api/realtime/init.ts
View file

@ -13,7 +13,7 @@ export default async (req: NextApiRequestAuth, res: NextApiResponse<RealtimeInit
if (req.method === 'GET') {
const { id: userId } = req.auth.user;
const websites = await getUserWebsites({ userId });
const websites = await getUserWebsites(userId);
const ids = websites.map(({ id }) => id);
const token = createToken({ websites: ids }, secret());
const data = await getRealtimeData(ids, subMinutes(new Date(), 30));

3
pages/api/websites/[id]/eventdata.ts
View file

@ -1,5 +1,4 @@
import { WebsiteMetric } from 'lib/types';
import { NextApiRequestQueryBody } from 'lib/types';
import { WebsiteMetric, NextApiRequestQueryBody } from 'lib/types';
import { canViewWebsite } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
import { NextApiResponse } from 'next';

3
pages/api/websites/[id]/events.ts
View file

@ -1,5 +1,4 @@
import { WebsiteMetric } from 'lib/types';
import { NextApiRequestQueryBody } from 'lib/types';
import { WebsiteMetric, NextApiRequestQueryBody } from 'lib/types';
import { canViewWebsite } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
import moment from 'moment-timezone';

3
pages/api/websites/[id]/index.ts
View file

@ -1,5 +1,4 @@
import { Website } from 'lib/types';
import { NextApiRequestQueryBody } from 'lib/types';
import { Website, NextApiRequestQueryBody } from 'lib/types';
import { canViewWebsite, canUpdateWebsite, canDeleteWebsite } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
import { NextApiResponse } from 'next';

3
pages/api/websites/[id]/metrics.ts
View file

@ -1,5 +1,4 @@
import { WebsiteMetric } from 'lib/types';
import { NextApiRequestQueryBody } from 'lib/types';
import { WebsiteMetric, NextApiRequestQueryBody } from 'lib/types';
import { canViewWebsite } from 'lib/auth';
import { FILTER_IGNORED } from 'lib/constants';
import { useAuth, useCors } from 'lib/middleware';