Commit Graph

632 Commits

Author SHA1 Message Date
Mike Cao
02a1438cfe More refactoring. 2023-01-30 21:44:07 -08:00
Mike Cao
5f15ad0807 More refactoring, cleaned up icons, nav buttons, add messages. 2023-01-27 21:53:13 -08:00
Mike Cao
7725b5c129 Refactored intl messages. 2023-01-25 07:42:46 -08:00
Mike Cao
cdd54df8f6 Refactored user components. 2023-01-23 15:32:35 -08:00
Mike Cao
91af593ff5 Updated settings components. 2023-01-20 17:12:53 -08:00
Mike Cao
1d9c3133f0 Refactored layout. Added NavBar component. 2023-01-18 15:05:39 -08:00
Mike Cao
53ec66e820 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components/pages/login/LoginForm.js
2023-01-11 14:48:17 -08:00
Mike Cao
4f15c4f146 Updated login and layout pages. 2023-01-11 14:47:38 -08:00
Brian Cao
b4bd988e4e WebsiteId query param. Fix Prisma filters. 2023-01-11 11:01:44 -08:00
Brian Cao
f654e6728c Fix links. 2023-01-11 10:49:04 -08:00
Mike Cao
9d967fb0fe Updated settings components and date filter. 2023-01-11 08:33:43 -08:00
Mike Cao
4b5b4db108 Updated settings components and date filter. 2023-01-10 17:18:59 -08:00
Mike Cao
70ef857dc7 Fix links. 2023-01-10 00:13:32 -08:00
Mike Cao
7450b76e6d Refactored settings components. 2023-01-09 23:59:26 -08:00
Mike Cao
d827b79c72 Updated forms usage. 2023-01-05 22:56:36 -08:00
Brian Cao
fcb1767eb1
Feat/um 145 re add events (#1733)
* Re-add events. Fix event_type queries.

* Re-add eventData

* revert CSS.
2023-01-05 19:39:29 -08:00
Mike Cao
796c65fa29 Updated login check method. 2023-01-04 21:20:24 -08:00
Mike Cao
db6a6d6055 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	components/forms/UserPasswordForm.js
#	components/pages/Dashboard.js
2022-12-28 15:49:28 -08:00
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -08:00
Brian Cao
b243f0a319 Fix Icon. 2022-12-28 12:56:22 -08:00
Brian Cao
74d2cd8d03
Feat/um 140 password modal (#1718)
* Change password to modal.

* Close on save.
2022-12-28 12:37:09 -08:00
Mike Cao
7bbed0e12b Changed HASH_SALT to APP_SECRET. 2022-12-27 21:38:23 -08:00
Mike Cao
cad0b73e42 Refactored useApi usage. 2022-12-27 20:20:44 -08:00
Brian Cao
a91386434d Remove snake_case. 2022-12-26 17:36:48 -08:00
Brian Cao
e1f99a7d01
Rewrite admin. (#1713)
* Rewrite admin.

* Clean up password forms.

* Fix naming issues.

* CSS Naming.
2022-12-26 16:57:59 -08:00
Mike Cao
e8e90a5451 Update website details layout. 2022-12-10 14:26:52 -08:00
Mike Cao
0a6ecfe3d2 Implement react-basics styles. Fix queries. 2022-12-08 23:43:43 -08:00
Mike Cao
b57ecf33e6 Updated roles and permissions logic. 2022-12-06 18:36:41 -08:00
Mike Cao
fe01574b16 Updated login form. 2022-11-28 11:14:24 -08:00
Mike Cao
2259ee8d76 Initial conversion to react-basics. 2022-11-21 22:32:55 -08:00
Mike Cao
c3a4d6c725 Added settings button. 2022-11-10 04:47:02 -08:00
Mike Cao
4f098a34c1 Hide user button for cloud. 2022-11-09 22:12:40 -08:00
Brian Cao
7bf12cc552 Assign user to userStore 2022-11-09 13:54:09 -08:00
Brian Cao
84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Mike Cao
f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Mike Cao
05245ca316 Use shallow routing for website details. 2022-11-02 08:57:52 -07:00
Brian Cao
17041efaae use uuid 2022-10-31 23:42:37 -07:00
Mike Cao
246e4e5f4f Fix disable checks. 2022-10-28 10:34:50 -07:00
Mike Cao
fc9584eb44 Refactor env check. 2022-10-27 16:42:57 -07:00
Brian Cao
99c975c329 add DISABLE_UI, DISABLE_ADMIN 2022-10-27 12:14:34 -07:00
Brian Cao
a49638b4c7 Merge branch 'feat/um-86-fix-website-update' into dev 2022-10-26 11:38:41 -07:00
Brian Cao
1d6f158509 fix id/uuid 2022-10-26 11:36:58 -07:00
Brian Cao
7f3db334f5
fix sort on dashboard (#1600) 2022-10-25 16:48:39 -07:00
Mike Cao
8b64ef1a4e Fixed issue with accessing user dashboards. Closes #1590 2022-10-25 15:48:49 -07:00
Mike Cao
2ad5cd9335 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	lib/auth.js
2022-10-25 10:46:32 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Brian Cao
ebf439c598
fix auth, add pg extension (#1596) 2022-10-25 10:27:43 -07:00
Mike Cao
994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24:20 -07:00
Brian Cao
a320d65652 default column/filters 2022-10-21 22:19:51 -07:00
Brian Cao
ba31f48f1a
Feat/um 49 query builder api (#1573)
* add uuid to event. add indexes

* eventdata api

* add event data

* remove test data

* update list
2022-10-21 21:33:23 -07:00
Mike Cao
6147c3502a
Merge pull request #1567 from umami-software/feat/um-69-nice
add cloud_mode
2022-10-12 17:33:54 -07:00
Brian Cao
9e8748e2f3 checkpoint 2022-10-12 16:29:44 -07:00
Brian Cao
db1ae3f2c7 add cloud_mode 2022-10-12 15:35:33 -07:00
Mike Cao
5a4fc96ebc Refactor API authentication. 2022-10-12 13:11:44 -07:00
Mike Cao
8627782137 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components/settings/WebsiteSettings.js
#	pages/api/websites/[id]/index.js
2022-10-11 21:51:47 -07:00
Mike Cao
5e2d23f18f Refactor auth logic. 2022-10-11 21:48:33 -07:00
Brian Cao
bce4476d12 fix reset/delete 2022-10-11 19:43:02 -07:00
Brian Cao
c147742d7a use uuid 2022-10-11 19:37:38 -07:00
Mike Cao
edd1751b81 Merge changes 2022-10-10 21:38:02 -07:00
Brian Cao
78338205a3
Feat/um 62 prisma property names (#1562)
* checkpoint

* fix pg schema

* fix mysql schema

* change property names
2022-10-10 13:42:18 -07:00
Mike Cao
2428314f58 Updated save method for websites. 2022-10-07 17:13:03 -07:00
Mike Cao
d784b2a8db Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	pages/api/account/index.js
2022-10-03 17:17:53 -07:00
Mike Cao
5fb1f08df8 Split up account update logic. 2022-09-29 15:15:11 -07:00
Mike Cao
add7c5ebe9
Merge pull request #1531 from userdehghani/pr-blank-target
open update links in new tab
2022-09-24 18:36:18 -07:00
Mohammad Amin Dehghani
e92cb29025 open update links in new tab 2022-09-21 17:49:18 +04:30
AriaieBOY
d8eb22932b
Update RealtimeLog.js 2022-09-19 19:28:52 +04:30
Mike Cao
52bbc3692d Fix issue with generating URLs. 2022-09-05 12:04:30 -07:00
Mike Cao
9f6834925b
Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning
Admins can assign websites to non-admins
2022-09-03 23:17:06 -07:00
Mike Cao
ee3c9debb2
Merge branch 'dev' into patch-1 2022-09-03 23:15:03 -07:00
Mike Cao
0bbfbc04c3
Merge pull request #1463 from guigrpa/add-yesterday
Add yesterday option
2022-09-03 21:23:51 -07:00
Dhravya Shah
aaf0effcbb
Fixed TypeError: Cannot read properties of undefined (reading 'website_id') 2022-09-01 19:48:21 +05:30
Brian Cao
d53b4a8895 roll back bigint. add loading 2022-08-30 00:03:22 -07:00
Mike Cao
2da51ee931 Merge remote-tracking branch 'origin/dev' into dev 2022-08-29 20:57:58 -07:00
Mike Cao
fb39ce8822 Fixed dashboard ordering issue. Closes #1414 2022-08-29 20:57:34 -07:00
Mike Cao
4cae9b261e
Merge pull request #1466 from guigrpa/bugfix-metric-card-keep-sign
Fixed bug in MetricCard: plus sign disappears on click.
2022-08-29 22:39:49 -05:00
Mike Cao
f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -07:00
Aidan Marshall
b388961b8b Features:
- Removes spellcheck for domain entry field
- Adds the ability to assign websites to other users if you are an admin
2022-08-26 17:22:46 +02:00
Guillermo Grau
e91bfed6be Fixed bug in MetricCard: plus sign disappears on click. 2022-08-26 16:40:32 +02:00
Guillermo Grau
b5c9690780 Added yesterday option in date range selector. 2022-08-26 10:36:46 +02:00
Mike Cao
3137436588 Updated message bundles. 2022-08-23 00:51:37 -07:00
Mike Cao
5873a56fff Updated check updates logic. 2022-08-09 14:58:27 -07:00
Mike Cao
bc75b622b5 Updated test console. Refactored fetch for tracker. 2022-08-09 10:27:35 -07:00
Mike Cao
8aa9941ca7 Show custom tracker script name. 2022-08-08 11:50:27 -07:00
Mike Cao
9b7e472410 Added CURRENT_VERSION constant. 2022-08-08 11:31:36 -07:00
Mike Cao
89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Mike Cao
7ae457669b Fix event table. 2022-08-05 13:07:20 -07:00
Mike Cao
62b032ab19 Refactored dashboard sort logic. 2022-08-04 21:37:18 -07:00
Mike Cao
42e87a4691 Fixed cancel of dashboard edit. 2022-08-04 14:30:09 -07:00
Mike Cao
1d4aa7c535 Refactored website ordering feature. 2022-08-04 03:56:30 -07:00
Mike Cao
4de1858950
Merge pull request #1338 from cywio/reorder-websites
Add ability to reorder websites on dashboard
2022-08-03 18:05:42 -05:00
Mike Cao
a4a6888248 Moved telemetry code to script. 2022-08-02 00:24:17 -07:00
Mike Cao
3d7e9392f0 Merge remote-tracking branch 'origin/dev' into dev 2022-08-01 23:05:24 -07:00
Mike Cao
50e491af06 Added endpoint for fetching server-side variables. 2022-08-01 23:04:47 -07:00
Brian Cao
8f934c7e6c checkpoint 2022-07-29 22:30:09 -07:00
Chris Walsh
88d1c19454
Fix graphical bugs when dragging 2022-07-28 17:16:03 -07:00
Chris Walsh
934d569bb2
Rename "change order" to "edit dashboard" 2022-07-28 16:59:44 -07:00
Chris Walsh
137ff97c07
Move reordering of websites onto dashboard 2022-07-24 23:25:04 -07:00
Chris Walsh
765add71a9
Restore table component and website settings page 2022-07-24 23:07:56 -07:00
Chris Walsh
76bdb6b1d6
Add reset order button to website settings 2022-07-23 23:07:53 -07:00
Chris Walsh
ef4bf8282a
Fix bug where toggle charts would reset ordering 2022-07-23 23:04:07 -07:00
Chris Walsh
5bd83b8127
Change dashboard websites to use ordered list 2022-07-23 23:02:47 -07:00
Chris Walsh
3926d3fe93
Add website ordering to state and settings page 2022-07-23 23:01:59 -07:00
Chris Walsh
70c6211e2c
Add draggable rows to table component 2022-07-23 22:56:13 -07:00
Chris Walsh
8d5c9c9711
Remove unused prop on UTM table 2022-07-21 19:52:32 -07:00
Chris Walsh
c3d6467b99
Add UTM params to website details page 2022-07-21 16:22:43 -07:00
Mike Cao
358c725828 Fix issue with unicode filtering. Closes #1258 2022-07-21 01:35:14 -07:00
Mike Cao
be8291c856 Refactored referrer logic. Display stats for no referrers. 2022-07-21 01:11:10 -07:00
Mike Cao
d95b53143e
Merge pull request #1304 from thueske/feature/screensize
Feature: Add screensize to UI
2022-07-18 00:37:07 -07:00
Mike Cao
e4c4019e25 Allow custom release URL. 2022-07-15 23:53:31 -07:00
Tobias Hüske
8d358ccb9d Feature: Add screensize to UI 2022-07-16 07:29:55 +02:00
Mike Cao
5e094cd6ab Added Galacian language. 2022-06-26 20:56:24 -07:00
Mike Cao
87bcd85b71 Remove console.log. 2022-06-24 02:01:55 -07:00
Mike Cao
c8ca0a0a56 Updated version checking. 2022-06-24 01:54:55 -07:00
Mike Cao
1bfb26ab44 Fix display of encoded characters. Closes #1171. 2022-06-23 13:44:30 -07:00
zx900930
ff8e8a37c8
Fix missing Dashboard translation 2022-06-01 14:10:16 +02:00
Mike Cao
e735a1c50d Updated share token logic. Closes #1113. 2022-05-05 19:04:28 -07:00
Brian Cao
b697b34cc7 remove decodeURI 2022-04-18 12:27:38 -07:00
Brian Cao
d0f1487107 fix filter link 2022-04-18 10:23:13 -07:00
Mike Cao
70d11100a6 Fix active users. 2022-04-11 00:26:43 -07:00
Mike Cao
46cfab864c
Merge pull request #1057 from ilhamsyahids/master
Fix active users not appear
2022-04-11 00:23:21 -07:00
Mike Cao
df1ddf3e73 Updated filter processing logic. 2022-04-11 00:19:29 -07:00
Mike Cao
fb2dc9f5ab Allow filtering on session fields. 2022-04-10 03:51:43 -07:00
Holger Huo
7c744589ae fix: further address issue in #1043 2022-04-07 18:01:17 +08:00
Mike Cao
faf6438852 Allow user to change admin username. 2022-04-03 22:25:32 -07:00
Ilham Syahid S
4a484286db
fix active users not appear 2022-03-27 11:02:18 +07:00
Kevin Decherf
35f9c7ef6c Update metric tables when filtering on referrer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-03-20 22:14:54 +01:00
Kevin Decherf
ecfc7ea68e Rename ref to prevent collision with react elements
It seems that, at least in dev mode, 'ref' may incorrectly refer to
react elements.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-03-20 22:10:41 +01:00
Mike Cao
607e6a7be1 Update events chart when filter selected. Closes #494 2022-03-17 20:56:43 -07:00
Mike Cao
e38f08b8f6 404 page should use local url. Closes #1028 2022-03-16 22:57:40 -07:00
Mike Cao
5f821461c2 Mobile css updates. 2022-03-11 16:04:05 -08:00
Mike Cao
5ca6f76daa Updated collect API response. 2022-03-10 20:39:11 -08:00
Mike Cao
3e8dd815b7 Fix CSS in header. 2022-03-05 09:42:32 -08:00
Mike Cao
20622116a8 New Dashboard component. 2022-03-03 19:45:49 -08:00
Mike Cao
33c921a32f Fix update notice styling. 2022-03-03 14:23:57 -08:00
Mike Cao
f1d97660fb Updated react-spring to latest. 2022-03-02 15:23:47 -08:00
Mike Cao
373dbf50ba Added website limit and show more button. Closes #592. 2022-03-01 23:03:50 -08:00
Mike Cao
7a3c1e9faa Fix default date range setting. 2022-03-01 22:02:31 -08:00
Mike Cao
69b81880cb Fix refresh button. Closes #994, #985. 2022-03-01 21:13:15 -08:00
Mike Cao
f547f2b0ec Add link to realtime referrers. 2022-03-01 19:41:37 -08:00
Mike Cao
0b846b482d Mobile layout updates. 2022-03-01 19:28:44 -08:00
Mike Cao
98b2ee29ef Added language and theme settings. 2022-02-28 20:54:32 -08:00
Mike Cao
3932cc4abb Fix realtime metrics header for mobile. Closes #959. 2022-02-28 18:43:16 -08:00
Mike Cao
34ad1d9c39 New mobile menu. 2022-02-28 18:39:37 -08:00
Mike Cao
be98500e82 Move auth token logic to useApi hook. 2022-02-27 00:25:24 -08:00
Mike Cao
3a8bfd1dbd Move auth token logic to useApi hook. 2022-02-26 15:53:45 -08:00
Mike Cao
d19b6b5a82 Added useApi hook. 2022-02-22 23:52:31 -08:00
Mike Cao
7bd49e6caf Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-02-22 22:52:06 -08:00
Mike Cao
63bc187490
Merge pull request #978 from sophiabits/fix-772
Don't show metric change indicator when metric delta is 0 (resolves #772)
2022-02-22 22:51:58 -08:00
Mike Cao
b564ee6613
Merge pull request #979 from sophiabits/fix-925
Truncate text & show tooltip when website name is too long (Resolves #925)
2022-02-22 22:51:34 -08:00
Mike Cao
9937caa569 Replaced redux with zustand. Fixed login issue, closes #980. 2022-02-22 22:47:59 -08:00