mirror of
https://github.com/kremalicious/umami.git
synced 2024-12-24 18:26:20 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
fa52e6c83f
@ -10,7 +10,6 @@ const unitTypes = ['year', 'month', 'hour', 'day'];
|
||||
|
||||
export interface WebsitePageviewRequestQuery {
|
||||
id: string;
|
||||
websiteId: string;
|
||||
startAt: number;
|
||||
endAt: number;
|
||||
unit: string;
|
||||
|
@ -7,7 +7,6 @@ import { getWebsiteStats } from 'queries';
|
||||
|
||||
export interface WebsiteStatsRequestQuery {
|
||||
id: string;
|
||||
type: string;
|
||||
startAt: number;
|
||||
endAt: number;
|
||||
url: string;
|
||||
|
@ -44,7 +44,7 @@ async function relationalQuery(data: Prisma.SessionCreateInput) {
|
||||
screen,
|
||||
language,
|
||||
country,
|
||||
subdivision1: country.concat('-', subdivision1),
|
||||
subdivision1: subdivision1 ? country.concat('-', subdivision1) : null,
|
||||
subdivision2,
|
||||
city,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user