Commit Graph

1984 Commits

Author SHA1 Message Date
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
94848cc41b Merge branch 'dev' into analytics 2022-11-16 11:59:31 -08:00
Mike Cao
592c3fa6e6 Merge remote-tracking branch 'origin/dev' into dev 2022-11-16 11:45:04 -08:00
Mike Cao
8722b794d9 Fixed share token check. 2022-11-16 11:44:36 -08:00
Francis Cao
106dd25594 clickhosue: validate string being sent into event_data 2022-11-16 11:42:02 -08:00
Mike Cao
f0a072ca9b
Merge pull request #1653 from umami-software/dev
merge dev to analytics
2022-11-15 11:52:14 -08:00
Mike Cao
091716e037 Updated middleware check. 2022-11-12 11:33:14 -08:00
Mike Cao
e9b1869eb8 Merge remote-tracking branch 'origin/dev' into dev 2022-11-11 09:44:08 -08:00
Mike Cao
1c64800157 Updated token payload. 2022-11-11 09:42:54 -08:00
Brian Cao
7271951871 Merge branch 'dev' into analytics 2022-11-10 12:27:36 -08:00
Brian Cao
563589393a Update schema table names. 2022-11-10 11:58:43 -08:00
Brian Cao
73a57cd2cf fix casing 2022-11-10 11:08:40 -08:00
Mike Cao
cd9036adaf Merge remote-tracking branch 'origin/dev' into dev 2022-11-10 04:47:24 -08:00
Mike Cao
c3a4d6c725 Added settings button. 2022-11-10 04:47:02 -08:00
Brian Cao
30743feb0e Add Reset / Delete functionality. 2022-11-09 22:46:50 -08:00
Mike Cao
4f098a34c1 Hide user button for cloud. 2022-11-09 22:12:40 -08:00
Brian Cao
6ee27a7e53 Fix typo on getMetrics. 2022-11-09 16:10:20 -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
Brian Cao
df84a16b95 Add external uuid to user create. 2022-11-09 10:59:03 -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
1bce4f2174 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 22:59:01 -08:00
Mike Cao
67732b9b5a Refactor authentication and token handling. 2022-11-08 22:58:52 -08:00
Brian Cao
9067d51172 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 17:47:23 -08:00
Brian Cao
4fbcf68b22 fix save event/pageview for CH 2022-11-08 17:47:19 -08:00
Mike Cao
1a8c7c42f4 Updated Clickhouse session logic. 2022-11-08 17:11:08 -08:00
Brian Cao
e9c8d16d5b pass in correct arguments to save pageview/event 2022-11-08 16:45:23 -08:00
Brian Cao
c2df477374 skip session check if using clickhouse 2022-11-08 15:50:34 -08:00
Brian Cao
224e9b3718 fix session get 2022-11-08 15:42:46 -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
168283bf11 Merge remote-tracking branch 'origin/dev' into dev 2022-11-07 22:35:59 -08:00
Mike Cao
f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Francis Cao
6a0d5ee1e6 add rev_id to CH schema 2022-11-07 18:03:27 -08:00
Mike Cao
3485b6268b Added rev_id column. Updated redis calls. 2022-11-07 16:22:49 -08:00
Mike Cao
a9112f39ec Updated schema. 2022-11-04 16:15:26 -07:00
Mike Cao
6b13d3eaa3 Added eslint declarations. 2022-11-03 21:33:37 -07:00
Mike Cao
990d76ff45
Update docker server url. 2022-11-03 08:52:47 -07:00
Mike Cao
1075325ec5 Update website fetch and update. 2022-11-02 15:45:47 -07:00
Mike Cao
05245ca316 Use shallow routing for website details. 2022-11-02 08:57:52 -07:00
Mike Cao
cb3895e565
Merge pull request #1628 from umami-software/feat/um-23-v2-schema-init
Feat/um 23 v2 schema init
2022-11-01 10:41:16 -07:00
Brian Cao
075d77abac change const 2022-11-01 09:56:43 -07:00
Mike Cao
0d897e957a
Merge pull request #1629 from umami-software/app
v1.39.4
2022-11-01 08:12:09 -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
d5fd333633 Bump version v2.0.0-beta.1. 2022-10-31 20:33:06 -07:00