Commit Graph
699 Commits
Author SHA1 Message Date
M M c13abb5cde Made files for status table component. 2024-07-11 10:49:13 -07:00
Alexander Holliday 9277a37559 Merge pull request #304 from bluewave-labs/feat/monitor-details-data
Feat/monitor details data
2024-07-10 12:34:02 -07:00
Alexander Holliday 52dacfb8ae Merge pull request #303 from bluewave-labs/feat/monitor-details-route
Update route to pass monitor ID to details component, #120
2024-07-10 12:09:58 -07:00
Alexander Holliday 9688278dbb Merge pull request #308 from bluewave-labs/feat/change-password-backend
Implemented update password functionality, #214
2024-07-10 12:09:25 -07:00
Alex Holliday 5a6cbcd325 Implemented update password functionality 2024-07-10 11:51:27 -07:00
Alex Holliday 5c1bb7ca6a Fetch data from endpoint instead of redux store 2024-07-10 10:33:32 -07:00
Alex Holliday 407edb6344 Details component connected to redux store 2024-07-10 10:10:02 -07:00
Alex Holliday 342d426da0 Update route to pass monitor ID to details component 2024-07-10 09:59:48 -07:00
Alexander Holliday 1ba37a7ec9 Merge pull request #256 from bluewave-labs/feat/details-pg
Details page implementation.
2024-07-10 09:51:12 -07:00
Alexander Holliday ac4c098d5f Merge pull request #302 from bluewave-labs/feat/account-deletion
Account deletion
2024-07-10 09:50:12 -07:00
Daniel Cojocea 85a2177f1d Removed unnecessary timeout and replaced Promise.then() 2024-07-10 10:01:36 -04:00
Daniel Cojocea bd5ed007eb Removed content type header from request 2024-07-09 20:51:26 -04:00
Daniel Cojocea d20ec58b0e Resolved conflict 2024-07-09 20:41:47 -04:00
Skorpios c799ba92e6 Merge pull request #301 from bluewave-labs/feat/image-deletion
Image deletion, resolves #297
2024-07-09 17:39:40 -07:00
M M 22f111cc66 Got rid of sorting fx's since checks will come sorted from the backend. 2024-07-09 17:36:07 -07:00
M M 5481d3f161 Updated fx's with comments to revisit. 2024-07-09 17:35:00 -07:00
M M 2f63a13fb8 Fixed conflicts. 2024-07-09 17:32:24 -07:00
M M 8d62da1b88 Resolved merge conflict in App.jsx 2024-07-09 17:15:11 -07:00
Daniel Cojocea 21483d67d5 Fixed image url error 2024-07-09 19:13:22 -04:00
Daniel Cojocea b54a10e519 Added delete user thunk 2024-07-09 19:11:16 -04:00
Daniel Cojocea ff2e08b483 Resolved conflict 2024-07-09 17:01:07 -04:00
Daniel Cojocea 76a31e0e1f Fixed close modal & submission logic 2024-07-09 16:46:24 -04:00
Alexander Holliday cf06b066d9 Merge pull request #300 from bluewave-labs/feat/token-revoke
Added configured axios instance with 401 interceptor, resolves #299
2024-07-09 13:26:20 -07:00
Alex Holliday 10c8751c6b Added configured axios instance with 401 interceptor, refactored all requests to use axios instance 2024-07-09 11:45:14 -07:00
Daniel Cojocea 06061cdb12 Fixed request not being sent when either profileImage or delete flag were undefined 2024-07-09 14:10:07 -04:00
Daniel Cojocea 40caf87900 Added checks for deleteImage 2024-07-09 13:54:59 -04:00
Daniel Cojocea 95fc67c900 Merge remote-tracking branch 'upstream/master' into feat/image-deletion 2024-07-09 13:35:17 -04:00
Alexander Holliday fb292d23a6 Merge pull request #298 from bluewave-labs/feat/backend-image-delete
Added delete image profile functionality to update user, #297
2024-07-09 10:34:31 -07:00
Alex Holliday 15b7383c61 Changed ParseBoolean functionality to allow for undefined and null 2024-07-09 10:29:11 -07:00
Alex Holliday f2fc5bd984 Changed parse boolean functionality to allow for undefined" 2024-07-09 10:28:41 -07:00
Alex Holliday 48ca591006 Added delete image profile functionality to update user 2024-07-09 10:23:22 -07:00
Daniel Cojocea 2c2cffcc84 Added delete image flag to form 2024-07-09 13:02:33 -04:00
Alexander Holliday 7deb796fa1 Merge pull request #296 from bluewave-labs/feat/monitors-pagination
Monitors pagination styling, resolves #295
2024-07-08 22:50:48 -07:00
Daniel Cojocea 44465efd25 Added offset fix 2024-07-09 01:40:45 -04:00
Daniel Cojocea 30f7ecff82 Fixed gap issue & added search svg 2024-07-08 20:03:27 -04:00
Daniel Cojocea f42facdea0 Changed pagination to reflect Figma design 2024-07-08 19:51:21 -04:00
Alexander Holliday 71703a9a1d Merge pull request #274 from bluewave-labs/feat/image-upload
Refactor upload image code, resolves #260
2024-07-08 13:43:50 -07:00
Daniel Cojocea b94d1021c2 Removed unused functions & fixed warning 2024-07-08 16:26:08 -04:00
Daniel Cojocea 31e4c7b110 Fixed avatar image not displaying 2024-07-08 16:06:12 -04:00
Daniel Cojocea 7f7226d6e5 Merge remote-tracking branch 'upstream/master' into feat/image-upload 2024-07-08 14:06:53 -04:00
Daniel Cojocea 4668728cbe Fixed conflict 2024-07-08 14:05:21 -04:00
Alexander Holliday 43792de54c Merge pull request #292 from bluewave-labs/feat/image-processing
Generate avatar image on register or update if an image is included, #259
2024-07-08 11:00:37 -07:00
Alexander Holliday 8622f95b30 Merge pull request #294 from bluewave-labs/feat/table-style
Table styling changes. resolves #290
2024-07-08 10:53:13 -07:00
Daniel Cojocea 475f7c69ae Styling changes 2024-07-08 13:42:45 -04:00
Alex Holliday 43bac259d7 Generate avatar image on register or update if an image is included 2024-07-08 10:26:56 -07:00
Alexander Holliday f9ca58c00a Merge pull request #287 from bluewave-labs/feat/MUI-table-and-pagination
Feat/m UI table and pagination
2024-07-08 08:32:57 -07:00
Alexander Holliday 094f0b3fd2 Merge pull request #288 from terryjung0244/feat/issue-225-Maintenance-page
Feat/issue 225 maintenance page
2024-07-08 08:32:14 -07:00
Alexander Holliday 4de1e71344 Merge branch 'master' into feat/issue-225-Maintenance-page 2024-07-07 21:57:44 -07:00
terryjung0244 31c16e8d3d 1.Added Icon-maintenance-gray.png to assets/images. 2.Imported and used MaintenanceIcon in DashboardMenuButton for the maintenance page button. 2024-07-07 22:18:57 -04:00
terryjung0244 a0bb52001e 1. Added route setup for the maintenance page in App.jsx.
2. Added a dashboard menu button for the maintenance page in DashboardMenu.
3. Moved content with CSS from the Incidents page to the Maintenance page.
4. Updated pathMap in PathMap.js to include the maintenance route.
2024-07-07 22:02:08 -04:00