m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 17:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,696 Commits 2 Branches 0 Tags 16 MiB
e9b0d3f796
Commit Graph

538 Commits

Author SHA1 Message Date
stoXmod
d199065d3a Improve sinhala font and added to language select menu 2023-01-10 12:38:57 +05:30
Mike Cao
f3879c92e1 Merge branch 'dev' of https://github.com/umami-software/umami into dev 
# Conflicts:
#	lib/middleware.ts
#	pages/api/users/[id]/index.ts
#	pages/api/users/index.ts
#	pages/api/websites/[id]/active.ts
#	pages/api/websites/[id]/eventdata.ts
#	pages/api/websites/[id]/events.ts
#	pages/api/websites/[id]/index.ts
#	pages/api/websites/[id]/metrics.ts
#	pages/api/websites/[id]/pageviews.ts
#	pages/api/websites/[id]/reset.ts
#	pages/api/websites/[id]/stats.ts
#	yarn.lock
 2022-12-31 13:54:44 -08:00
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -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
561cde6e7e
Add admin check. (#1716) 
* Add admin check.

* Fix teamId check.
 2022-12-27 15:18:58 -08:00
Mike Cao
c90bd941b5 Merge remote-tracking branch 'origin/dev' into dev 2022-12-27 00:00:42 -08:00
Mike Cao
aef7326f4c Added access_code column to teams. 2022-12-27 00:00:31 -08:00
Brian Cao
ef9d915592 Fix event var names. 2022-12-26 23:21:54 -08:00
Mike Cao
dff105c747 Updated prisma and redis clients. 2022-12-26 21:51:16 -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
1fcaa1c9fc Updated log messages. 2022-12-14 23:13:57 -08:00
Mike Cao
4c202741c2 Fixed share page. 2022-12-13 11:27:55 -08:00
Brian Cao
8732d056dd
Dev (#1702) 
* Initial Typescript models.

* Re-add realtime data

* get distinct sessions for session metrics

* Add queries for new schema.

* Fix Typo.

* Add some api/team endpoints.

* Fix destructure error.

* Fix getWebsites call.

* Ignore typescript build errors.

* Fix enum issue.

* add clickhouse route to deleteWebsite

* Fix Website auth.

* Updated lint-staged config.

* Add permission checks.

* Add user role api.

* Fix error when updating website.

* Fix isAdmin check.  Fix Schema.

* Initial conversion to react-basics.

* Remove user/team transfer from website update.

* delete website in relational query

* Fix login secure token creation.

* Add event type to event.

* Allow user to be added to team with role.

* Updated login form.

* Add Role to TeamUser.

* Add database migration.

* Refactored permissions check. Updated redis lib.

* Feat/um 114 roles and permissions (#1683)

* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions

* Add 02 migration.

* Added lib/types.

* Updated schema.

* Updated roles and permissions logic.

* Implement react-basics styles. Fix queries.

* Update website details layout.

* Add 01 migration.

* Fix admin create.

* Update react-basics.

Co-authored-by: Francis Cao <franciscao@gmail.com>
Co-authored-by: Mike Cao <mike@mikecao.com>
Co-authored-by: Mike Cao <moocao@gmail.com>
 2022-12-12 19:45:38 -08:00
Mike Cao
b57ecf33e6 Updated roles and permissions logic. 2022-12-06 18:36:41 -08:00
Mike Cao
4781a0cc8c Added lib/types. 2022-12-02 14:15:24 -08:00
Brian Cao
06bebadbb9
Feat/um 114 roles and permissions (#1683) 
* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions
 2022-12-01 20:53:37 -08:00
Mike Cao
a4e80ca3e5 Refactored permissions check. Updated redis lib. 2022-12-01 10:58:50 -08:00
Brian Cao
77b739870e Add database migration. 2022-11-29 21:56:43 -08:00
Mike Cao
2259ee8d76 Initial conversion to react-basics. 2022-11-21 22:32:55 -08:00
Brian Cao
78225691df Add permission checks. 2022-11-20 00:48:13 -08:00
Brian Cao
e28ee6597a Fix Website auth. 2022-11-18 18:49:58 -08:00
Brian Cao
ce02958bc2 Fix enum issue. 2022-11-18 11:22:03 -08:00
Brian Cao
b0c7980a20 Merge branch 'dev' into feat/um-23-new-schema 2022-11-16 18:34:03 -08:00
Mike Cao
8722b794d9 Fixed share token check. 2022-11-16 11:44:36 -08:00
Brian Cao
0aaba8cbd1 Initial Typescript models. 2022-11-15 13:21:14 -08:00
Mike Cao
2555ee09d1 Added Croatian language. 2022-11-12 21:03:47 -08:00
Mike Cao
091716e037 Updated middleware check. 2022-11-12 11:33:14 -08:00
Mike Cao
1c64800157 Updated token payload. 2022-11-11 09:42:54 -08:00
Brian Cao
84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Mike Cao
d2100c33b7 Update auth logic. 2022-11-09 10:16:50 -08:00
Mike Cao
76cad96a24 Updated auth to check for uuid. 2022-11-09 10:15:21 -08:00
Mike Cao
8a74138e17 Fixed website create. 2022-11-09 07:40:17 -08:00
Mike Cao
3b705e6cb4 Fetch user inside useAuth. 2022-11-09 06:40:36 -08:00
Mike Cao
67732b9b5a Refactor authentication and token handling. 2022-11-08 22:58:52 -08:00
Mike Cao
1a8c7c42f4 Updated Clickhouse session logic. 2022-11-08 17:11:08 -08:00
Brian Cao
c2df477374 skip session check if using clickhouse 2022-11-08 15:50:34 -08:00
Brian Cao
648a5341e5 fix useAuth 2022-11-08 12:51:04 -08:00
Mike Cao
208fcb8418 Added redis check to verify. 2022-11-08 12:28:45 -08:00
Brian Cao
13fd3ccd16
api and lib fixes (#1643) 2022-11-08 11:55:02 -08:00
Mike Cao
f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Mike Cao
3485b6268b Added rev_id column. Updated redis calls. 2022-11-07 16:22:49 -08:00
Maxime-J
268c036632 custom fr-FR date format 2022-11-07 18:38:43 +00:00
Mike Cao
1075325ec5 Update website fetch and update. 2022-11-02 15:45:47 -07:00
Brian Cao
075d77abac change const 2022-11-01 09:56:43 -07:00
Brian Cao
689b732829 Merge branch 'dev' into feat/um-23-v2-schema-init 2022-10-31 23:48:12 -07:00
Brian Cao
17041efaae use uuid 2022-10-31 23:42:37 -07:00
Mike Cao
c58e037a7e Updated useConfig. Added SSO page. 2022-10-31 11:02:37 -07:00
Mike Cao
aceb904398
v1.39.2 (#1599) 
* Fixed issue with realtime page rendering.

* fix auth, add pg extension (#1596)

* Fixed change password issue. API refactoring. Closes #1592.

* Fixed account lookup.

* Fixed issue with accessing user dashboards. Closes #1590

* fix sort on dashboard (#1600)

Co-authored-by: Brian Cao <brian@umami.is>
 2022-10-25 16:50:12 -07:00
Mike Cao
46a18f2918 Fixed account lookup. 2022-10-25 11:01:28 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Mike Cao
2290be7ca4 Fixed share page issue. 2022-10-24 19:48:10 -07:00
Brian Cao
500a2b9663 fix column names 2022-10-21 22:30:52 -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
5a4fc96ebc Refactor API authentication. 2022-10-12 13:11:44 -07:00
Mike Cao
c33729e185 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-10-11 23:48:05 -07:00
Brian Cao
07d003e858 fix collect 2022-10-11 23:09:06 -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
b0bed5e73a Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-11 10:31:15 -07:00
Mike Cao
edd1751b81 Merge changes 2022-10-10 21:38:02 -07:00
Brian Cao
4073d57e64 roll back id adds 2022-10-10 17:01:48 -07:00
Brian Cao
ec6454aead Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-10 16:20:07 -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
Francis Cao
96add409b6 update api to new CH columns 2022-10-08 16:12:33 -07:00
Mike Cao
73e7f647c0
Merge pull request #1551 from sergiomensing/fix-color-dots-in-realtime-logs 
Fix unique dot colors in the realtime logs
 2022-10-07 16:34:51 -07:00
Brian Cao
dcf16e1411 fix redis init 2022-10-06 16:41:37 -07:00
Mike Cao
e442617421 Add connect methods to libraries. 2022-10-06 15:00:16 -07:00
Mike Cao
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Brian Cao
0387cf0da0 remove CH import 2022-10-06 12:49:49 -07:00
Sergio Mensing
e8a30e7251 use slice instead of substring for desired result 2022-10-05 14:44:49 +02:00
Brian Cao
d4abe51331 remove database_type from prisma getdb function 2022-09-28 15:36:41 -07:00
Mike Cao
dfac7e1af5 Updated Kafka loading process. 2022-09-22 10:36:23 -07:00
Francis Cao
55218d1ddd
Francis/uc 37 secure kafka (#1532) 
* add ssl encryption to kafka client

* fix missing columns in getPageview CH. fix Kafka SSL Pathing
 2022-09-21 11:31:52 -07:00
Brian Cao
dd54fb3d2c combine logic 2022-09-13 09:18:58 -07:00
Brian Cao
c73d07d329 clarified var 2022-09-13 09:16:21 -07:00
Brian Cao
52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
Brian Cao
99914d6e98 Add retry connection to redis. Clean up up redis/session logic 2022-09-05 22:47:45 -07:00
Mike Cao
b829d84fc1 Merge remote-tracking branch 'origin/dev' into dev 2022-09-05 15:36:10 -07:00
Mike Cao
13cf286874 Fix www replace. 2022-09-05 15:35:36 -07:00
Brian Cao
42bdfccdf4 Fix website get during collection/session check 2022-09-05 11:36:57 -07:00
Mike Cao
0bbfbc04c3
Merge pull request #1463 from guigrpa/add-yesterday 
Add yesterday option
 2022-09-03 21:23:51 -07:00
Brian Cao
afe6d8994b fix redis connection. fix delete account 2022-09-01 11:11:11 -07:00
Brian Cao
f18b5a20e3 remove bigint 2022-08-30 13:56:37 -07:00
Brian Cao
d53b4a8895 roll back bigint. add loading 2022-08-30 00:03:22 -07:00
Mike Cao
fb39ce8822 Fixed dashboard ordering issue. Closes #1414 2022-08-29 20:57:34 -07:00
Brian Cao
45e928c3a0 remove bigint convert 2022-08-29 16:46:28 -07:00
Brian Cao
727631a879 remove key 2022-08-29 16:35:50 -07:00
Brian Cao
b6cd9f305b add db call as fallback 2022-08-29 13:04:58 -07:00
Brian Cao
9ddbd12060 re-add log 2022-08-29 10:47:31 -07:00
Brian Cao
48fe6ebcc5 configure redis 2022-08-29 10:47:01 -07:00
Mike Cao
efb52f5ff1 Fix crypto errors. 2022-08-29 08:31:16 -07:00
Mike Cao
5f07cecc95 Rename method to transaction. 2022-08-29 00:02:38 -07:00
Mike Cao
f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -07:00
Mike Cao
467c7f289f Database refactoring. 2022-08-27 21:38:35 -07:00
Mike Cao
3327bcf5a3 Refactor get database type logic. 2022-08-26 22:43:31 -07:00
Brian Cao
b29cece7ef fix relational 2022-08-26 21:29:26 -07:00
Brian Cao
54ade11a98 fix send message. look at redis on session create 2022-08-26 21:10:46 -07:00
Brian Cao
818f8721e9 redis checkpoint 2022-08-26 20:21:53 -07:00
Guillermo Grau
b5c9690780 Added yesterday option in date range selector. 2022-08-26 10:36:46 +02:00
Brian Cao
10cc6616c5 add redis placeholder 2022-08-25 23:12:47 -07:00
Brian Cao
f499af5491 fix refs 2022-08-25 22:43:22 -07:00
Brian Cao
c811577460 fix folders 2022-08-25 22:20:30 -07:00
Brian Cao
bb50753704 split db files 2022-08-25 22:04:32 -07:00
Brian Cao
46b4b98d40 update kafka messaging 2022-08-25 11:07:47 -07:00
Mike Cao
700158f5f6 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-08-23 00:48:57 -07:00
Francis Cao
295ce2487d Merge branch 'master' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-18 16:54:57 -07:00
Francis Cao
0beedb0e1c add properties to kafka client 2022-08-18 11:07:30 -07:00
Francis Cao
192dd218cb move kafka logic into own file 2022-08-12 09:21:43 -07:00
Mike Cao
c0276db6e3 Fixed session check logic. Closes #1340. 2022-08-11 12:11:43 -07:00
Francis Cao
085b6b4071 fix event metrics 2022-08-09 00:43:47 -07:00
Francis Cao
55ba7d95ab fix clickhouse date timezone issues 2022-08-08 22:09:18 -07:00
Mike Cao
9b7e472410 Added CURRENT_VERSION constant. 2022-08-08 11:31:36 -07:00
Francis Cao
fc3c39be3c Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-08 08:36:21 -07:00
Mike Cao
89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Mike Cao
62b032ab19 Refactored dashboard sort logic. 2022-08-04 21:37:18 -07:00
Francis Cao
1ffd5775f8 Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-04 17:48:00 -07:00
Francis Cao
1ab1e58cb1 create kafka save queries 2022-08-04 17:43:47 -07:00
Mike Cao
1d4aa7c535 Refactored website ordering feature. 2022-08-04 03:56:30 -07:00
Mike Cao
62dce0a8d1 Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 20:32:34 -07:00
Mike Cao
c37554214d Moved geo database location. 2022-08-03 19:20:13 -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
df1c203c38
Merge pull request #1376 from umami-software/brian/um-24-event-data 
Brian/um 24 event data
 2022-08-01 23:50:08 -05:00
Mike Cao
ab1e49e703 Added Bengali and Thai languages. 2022-08-01 17:14:36 -07:00
Francis Cao
d952214536 check in producer test logic 2022-08-01 00:28:38 -07:00
Brian Cao
8f934c7e6c checkpoint 2022-07-29 22:30:09 -07:00
Brian Cao
f189035a73 fix CH return. 2022-07-25 09:47:11 -07:00
Kevin Van Ryckegem
5ef979d61d #1340 : Fix when session received is not an array, but the direct object 2022-07-25 00:44:53 +02:00
Chris Walsh
3926d3fe93
Add website ordering to state and settings page 2022-07-23 23:01:59 -07:00
Mike Cao
ba1e28f082 Fix filter issue for metrics. Closes #1268 2022-07-22 23:56:29 -07:00
Brian Cao
f569055771 PR comments 2022-07-22 22:42:01 -07:00
Brian Cao
aa8057f9fe fix stats query 2022-07-22 17:47:26 -07:00
Brian Cao
304314fff0 Merge branch 'dev' into brian/um-16-clickhouse-support 2022-07-22 17:03:42 -07:00
Brian Cao
65910c7348 clickhouse inserts 2022-07-22 14:43:19 -07:00
Maxime-J
bb1d17a5e2 follow-up - reverted getDateQuery logic 2022-07-22 12:35:37 +00:00
Mike Cao
07d276106e Fixed date query for MySQL. 2022-07-21 21:21:48 -07:00
Mike Cao
250cdce306 Reverted getDateQuery logic. 2022-07-21 13:21:33 -07:00
Mike Cao
be8291c856 Refactored referrer logic. Display stats for no referrers. 2022-07-21 01:11:10 -07:00
Brian Cao
6ea2282f82 convert analytics queries 2022-07-20 21:31:26 -07:00
Mike Cao
ae354ba676
Merge pull request #1283 from njfdev/master 
Add Filter to Have Direct Referrer
 2022-07-20 14:25:14 -07:00
Mike Cao
e4c4019e25 Allow custom release URL. 2022-07-15 23:53:31 -07:00
Brian Cao
4f12933f42 checkpoint 2022-07-15 22:21:37 -07:00
Brian Cao
20b8337e35 checkpoint 2022-07-15 16:47:38 -07:00
Brian Cao
9803d4b5ee Merge branch 'dev' into brian/um-22-query-folder-structure 2022-07-12 22:34:05 -07:00
Brian Cao
f327b5c0f7 fix imports 2022-07-12 15:14:27 -07:00
Brian Cao
8aec6d7406 move queries 2022-07-12 14:14:36 -07:00
Nicholas Fasching
448a62d884
Update Blank Referrer Text 
I think this capitalization and spacing looks better after looking at it again.
 2022-07-09 08:53:06 -04:00
Nicholas Fasching
b90b2b9bb2
Update lib/filters.js 
Co-authored-by: Rohan Deb Sarkar <rohandebsarkar+git@gmail.com>
 2022-07-09 07:46:45 -04:00