Commit Graph

208 Commits (64c6d73b77c7f6b1d8081c8c7d6aed80d7d87515)

Author SHA1 Message Date
Mike Cao e2fcd40c2b Added SettingsTable. 2023-04-12 13:40:19 -07:00
Mike Cao f84e41e198 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	components/messages.js
2023-04-10 07:25:27 -07:00
Mike Cao 94ed67e339 Responsive updates. 2023-04-09 20:22:28 -07:00
Brian Cao f7119d494b Fix translation. 2023-04-09 16:06:59 -07:00
Brian Cao 9eff565e7a Fix teamWebsite / teamUser. 2023-04-09 16:04:28 -07:00
Mike Cao 2656de6682 Updated language bundles with new keys. 2023-04-08 13:14:22 -07:00
Francis Cao f38f0c6420
Merge pull request #1873 from umami-software/bug/um-250-fix-realtime-data
fix some components in realtime data
2023-04-07 10:56:42 -07:00
Francis Cao db845d6c04 remove urlpath conditional 2023-04-07 10:28:54 -07:00
Francis Cao 05ece6a4d0 fix some components in realtime data 2023-04-06 18:31:16 -07:00
Mike Cao f56374b259 Migrate changes from cloud. 2023-04-05 09:55:21 -07:00
Mike Cao d851a9e88b Fixed test console error. 2023-04-04 00:27:25 -07:00
Brian Cao 6805a8978a Move loading button logic out. 2023-04-02 12:24:50 -07:00
Mike Cao 17601c4dea Style scrollbars. 2023-03-31 21:31:58 -07:00
Mike Cao 14802afe8b Fixed pages table loading. Fixed z-indexes. 2023-03-31 20:03:28 -07:00
Mike Cao 9dd35b3766 Fixed metrics display. 2023-03-31 05:55:28 -07:00
Brian Cao e4c801e823 Merge remote-tracking branch 'origin/dev' into dev 2023-03-30 10:46:01 -07:00
Brian Cao c175120aa2 Add page title to test console. 2023-03-30 10:45:58 -07:00
Mike Cao d471d05217 Added config to open websites in new tab. 2023-03-29 23:08:26 -07:00
Brian Cao 6d5aeb3bd1 Fix joining team dupe. Add loading to team member remove. Fix messages. 2023-03-29 16:02:14 -07:00
Mike Cao cdacb640c6 Updated tracker and collect. 2023-03-26 04:15:08 -07:00
Mike Cao 43ef6884df Updated layout for settings pages. 2023-03-24 10:55:20 -07:00
Mike Cao 9260e5bc33 Updated settings. 2023-03-23 16:33:10 -07:00
Brian Cao 9979672de5
Feat/um 202 event data new (#1841)
* Add event_data base.

* Add url_path.

* Add eventData back.

* Finish event_data relational.

* resolve comments.
2023-03-23 14:01:15 -07:00
Mike Cao c2789d70bc Added SideNav component. 2023-03-23 11:46:49 -07:00
Mike Cao 9ddb8b5d25 Use useMessages hook everywhere. 2023-03-22 14:05:55 -07:00
Mike Cao f3e1f18e1b Updated sticky header logic. 2023-03-22 01:53:34 -07:00
Mike Cao fc2a8f3d9f Updated navigation. 2023-03-21 21:28:36 -07:00
Mike Cao c62e2e9cc7 Update tooltip date formats. 2023-03-16 15:56:05 -07:00
Mike Cao 9a3e8921a7 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-03-10 18:45:51 -08:00
Mike Cao 6ba00152c2 Updated filter tags. 2023-03-10 17:49:19 -08:00
Brian Cao 701bde53b7 Hook up teamMemberDelete and teamDelete. 2023-03-09 23:21:19 -08:00
Brian Cao 8a9532f213
Feat/um 197 hook up teams (#1825)
* Link up teams UI.

* Fix auth order.

* PR touchups.
2023-03-09 12:42:12 -08:00
Mike Cao 0607e9f442 Upgraded next to 13. Fixed date filter for websites. 2023-03-08 20:23:32 -08:00
Mike Cao 696d9c978c Updated date range handling. Fixed share page. 2023-03-08 16:37:43 -08:00
Mike Cao bb99b3eba5 Fixed sticky header scrolling. Updated settings button. 2023-03-03 12:37:26 -08:00
Mike Cao 3ac560dc0f Added checks for CLOUD_MODE. 2023-02-28 20:04:07 -08:00
Mike Cao 5657a64c77 Pass domain to realtime components. 2023-02-24 02:41:02 -08:00
Mike Cao 7d3334ccce Fixed realtime logs. 2023-02-22 20:59:59 -08:00
Mike Cao 802c262cd9 Fixed realtime chart display. 2023-02-17 21:42:42 -08:00
Mike Cao 93b77672f3 More updates to realtime. 2023-02-15 02:27:18 -08:00
Mike Cao 28921a7cd5 Updates to realtime. Fixed refresh button. 2023-02-14 17:23:20 -08:00
Mike Cao 638a674e99 Fixed filter tags. Added clear all option. 2023-02-11 22:10:14 -08:00
Mike Cao 4a689bf294 Added website menu view. Fixed pages filter. 2023-02-10 23:21:50 -08:00
Mike Cao d4437427c4 Removed prop-types. 2023-02-10 03:37:06 -08:00
Mike Cao c815e7cd51 More refactoring and clean-up. 2023-02-10 03:26:57 -08:00
Mike Cao 45c13da262 More deletes. Fixed sticky header. 2023-02-08 23:14:11 -08:00
Mike Cao 87bbaa7f1d Fixed tooltips. 2023-02-07 22:17:55 -08:00
Mike Cao ad5e34a894 Fixed lint issues. 2023-02-07 16:29:25 -08:00
Mike Cao 54d5af5cbb Progress check-in. 2023-02-04 08:59:52 -08:00
Mike Cao 0ce2d1fbfc Team delete functionality. 2023-02-02 11:59:38 -08:00
Mike Cao 835289a1f8 Fixed team websites query. 2023-02-02 03:30:09 -08:00
Mike Cao 22aeaf7166 Added owner column to teams table. 2023-02-02 02:54:43 -08:00
Mike Cao 656df4f846 Update teams features. 2023-02-01 18:39:54 -08:00
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 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 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
Brian Cao 84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Brian Cao 17041efaae use uuid 2022-10-31 23:42:37 -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 994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24:20 -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 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 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 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 ee3c9debb2
Merge branch 'dev' into patch-1 2022-09-03 23:15:03 -07:00
Dhravya Shah aaf0effcbb
Fixed `TypeError: Cannot read properties of undefined (reading 'website_id')` 2022-09-01 19:48:21 +05:30
Mike Cao fb39ce8822 Fixed dashboard ordering issue. Closes #1414 2022-08-29 20:57:34 -07:00
Mike Cao f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -07:00
Mike Cao bc75b622b5 Updated test console. Refactored fetch for tracker. 2022-08-09 10:27:35 -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