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

Merge branch 'dev' of https://github.com/umami-software/umami into analytics

Browse source
This commit is contained in:
Francis Cao 2025-05-08 09:17:19 -07:00
commit 51d6f88a21
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -64,10 +64,10 @@ mysql://username:mypassword@localhost:3306/mydb
### Build the Application ### Build the Application
```bash ```bash
npm build npm run build
``` ```
*The build step will create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.* _The build step will create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**._
### Start the Application ### Start the Application
@ -75,7 +75,7 @@ npm build
npm run start npm run start
``` ```
*By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.* _By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly._
--- ---

2
pnpm-lock.yaml generated
View file

@ -346,8 +346,6 @@ importers:
specifier: ^5.5.3 specifier: ^5.5.3
version: 5.8.3 version: 5.8.3
src/generated/prisma: {}
packages: packages:
'@ampproject/remapping@2.3.0': '@ampproject/remapping@2.3.0':

2
src/lib/charts.ts
View file

@ -11,7 +11,7 @@ export function renderDateLabels(unit: string, locale: string) {
switch (unit) { switch (unit) {
case 'minute': case 'minute':
return formatDate(d, 'p', locale).split(' ')[0]; return formatDate(d, 'h:mm', locale);
case 'hour': case 'hour':
return formatDate(d, 'p', locale); return formatDate(d, 'p', locale);
case 'day': case 'day':

4
src/queries/sql/reports/getAttribution.ts
View file

@ -84,7 +84,7 @@ async function relationalQuery(
sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) value sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) value
from event_data ed from event_data ed
join website_event we join website_event we
on we.event_id = ed.website_event_Id on we.event_id = ed.website_event_id
and we.website_id = ed.website_id and we.website_id = ed.website_id
join (select website_event_id join (select website_event_id
from event_data from event_data
@ -395,7 +395,7 @@ async function clickhouseQuery(
fbclid != '', 'Facebook / Meta', fbclid != '', 'Facebook / Meta',
msclkid != '', 'Microsoft Ads', msclkid != '', 'Microsoft Ads',
ttclid != '', 'TikTok Ads', ttclid != '', 'TikTok Ads',
li_fat_id != '', ' LinkedIn Ads', li_fat_id != '', 'LinkedIn Ads',
twclid != '', 'Twitter Ads (X)','') name, twclid != '', 'Twitter Ads (X)','') name,
${currency ? 'sum(e.value)' : 'uniqExact(we.session_id)'} value ${currency ? 'sum(e.value)' : 'uniqExact(we.session_id)'} value
from model m from model m