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

Upgrade to Next 14.

Browse source
This commit is contained in:
Mike Cao 2023-12-09 22:18:47 -08:00
parent 44e243ad12
commit 08bd9e8357
4 changed files with 74 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/app/(main)/websites/[id]/realtime/Realtime.tsx
View file

@ -6,16 +6,16 @@ import { Grid, GridRow } from 'components/layout/Grid';
import Page from 'components/layout/Page';
import RealtimeChart from 'components/metrics/RealtimeChart';
import WorldMap from 'components/metrics/WorldMap';
import useApi from 'components/hooks/useApi';
import { useWebsite } from 'components/hooks';
import { percentFilter } from 'lib/filters';
import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';
import { RealtimeData } from 'lib/types';
import RealtimeLog from './RealtimeLog';
import RealtimeHeader from './RealtimeHeader';
import RealtimeUrls from './RealtimeUrls';
import RealtimeCountries from './RealtimeCountries';
import WebsiteHeader from '../WebsiteHeader';
import useApi from 'components/hooks/useApi';
import { percentFilter } from 'lib/filters';
import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';
import { useWebsite } from 'components/hooks';
import { RealtimeData } from 'lib/types';
import styles from './Realtime.module.css';
function mergeData(state = [], data = [], time: number) {

19
src/app/Providers.tsx
View file

@ -1,4 +1,5 @@
'use client';
import { useEffect, useState } from 'react';
import { IntlProvider } from 'react-intl';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactBasicsProvider } from 'react-basics';
@ -26,14 +27,18 @@ function MessagesProvider({ children }) {
}
function SettingsProvider({ children }) {
const hostUrl = process.env.hostUrl || location.origin;
const [config, setConfig] = useState({});
const config = {
settingsUrl: '/settings/websites',
shareUrl: hostUrl,
trackingCodeUrl: hostUrl,
websitesUrl: `/websites`,
};
useEffect(() => {
const hostUrl = process.env.hostUrl || window?.location.origin;
setConfig({
settingsUrl: '/settings/websites',
shareUrl: hostUrl,
trackingCodeUrl: hostUrl,
websitesUrl: `/websites`,
});
}, []);
return <SettingsContext.Provider value={config}>{children}</SettingsContext.Provider>;
}