m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feat/um-23-new-schema

Browse Source
This commit is contained in:
Mike Cao 2022-11-18 03:21:55 -08:00
commit 4bc3d46efb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/useRequireLogin.js
View File

@ -12,17 +12,14 @@ export default function useRequireLogin() {
async function loadUser() { async function loadUser() {
setLoading(true); setLoading(true);
const { const { ok, data } = await get('/auth/verify');
ok,
data: { user },
} = await get('/auth/verify');
if (!ok) { if (!ok) {
await router.push('/login'); await router.push('/login');
return null; return null;
} }
setUser(user); setUser(data.user);
setLoading(false); setLoading(false);
} }

2
queries/analytics/session/getSessionMetrics.ts
View File

@ -54,7 +54,7 @@ async function clickhouseQuery(
const { filterQuery } = parseFilters(filters, params); const { filterQuery } = parseFilters(filters, params);
return rawQuery( return rawQuery(
`select ${field} x, count(*) y `select ${field} x, count(distinct session_id) y
from event as x from event as x
where website_id = $1 where website_id = $1
and rev_id = $2 and rev_id = $2