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

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	package.json
#	src/components/hooks/useTimezone.ts
#	yarn.lock
This commit is contained in:
Mike Cao 2025-02-19 22:55:40 -08:00
commit edb7022c55
13 changed files with 117 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/hooks/useApi.ts
View file

@ -9,7 +9,7 @@ const selector = (state: { shareToken: { token?: string } }) => state.shareToken
async function handleResponse(res: FetchResponse): Promise<any> {
if (!res.ok) {
return Promise.reject(new Error(res.error));
return Promise.reject(new Error(res.error?.error || res.error || 'Unexpectd error.'));
}
return Promise.resolve(res.data);
}

3
src/components/hooks/useTimezone.ts
View file

@ -2,11 +2,13 @@ import { setItem } from '@/lib/storage';
import { TIMEZONE_CONFIG } from '@/lib/constants';
import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz';
import { useApp, setTimezone } from '@/store/app';
import { useLocale } from './useLocale';
const selector = (state: { timezone: string }) => state.timezone;
export function useTimezone() {
const timezone = useApp(selector);
const { dateLocale } = useLocale();
const saveTimezone = (value: string) => {
setItem(TIMEZONE_CONFIG, value);
@ -20,6 +22,7 @@ export function useTimezone() {
: date.split(' ').join('T') + 'Z',
timezone,
pattern,
{ locale: dateLocale },
);
};