Commit Graph

633 Commits

Author SHA1 Message Date
Daniel Cojocea 475f7c69ae Styling changes 2024-07-08 13:42:45 -04: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
Alexander Holliday feb4a8899d Merge pull request #285 from bluewave-labs/feat/navigate-back
Added navigation button, resolves #258
2024-07-07 18:59:00 -07:00
Alexander Holliday b4861211b3 Merge pull request #286 from bluewave-labs/feat/update-navbar
Updated navbar user dropdown, resolves #224
2024-07-07 18:58:25 -07:00
Daniel Cojocea 41787c538c Updated navbar user dropdown 2024-07-07 19:15:44 -04:00
Daniel Cojocea 89c0ccac56 Added navigation button 2024-07-07 18:25:03 -04:00
Alex Holliday 0555157200 Added animations back, added pagination 2024-07-06 23:07:04 -07:00
Alexander Holliday f8cdb8f3a8 Merge pull request #283 from MuhammadKhalilzadeh/front-end-login-textfields
textfield login page height fixed
2024-07-06 22:35:11 -07:00
MuhammadKhalilzadeh 5c9b111707 textfield login page height fixed 2024-07-07 08:59:36 +03:30
Alexander Holliday 43fbbbd4a7 Merge pull request #257 from MuhammadKhalilzadeh/backend-completion
Backend completion
2024-07-06 22:19:37 -07:00
Alexander Holliday ad26d1ba19 Update authController.js
Removed log statement
2024-07-06 22:19:02 -07:00
Alexander Holliday d88ac3c5c4 Update authRoute.js
Added userID param back to delete route, needed for middleware functionality
2024-07-06 22:18:23 -07:00
Alex Holliday 6a7a919789 Use react table instead of data grid for performance 2024-07-06 21:59:41 -07:00
Alexander Holliday e02b42b86b Merge pull request #280 from bluewave-labs/feat/alert-refactor
Alert component, resolves #279
2024-07-06 13:59:14 -07:00
Daniel Cojocea 49f8958418 Added proptypes and jsdocs, and color fix 2024-07-06 14:44:04 -04:00
Daniel Cojocea bf62404247 Removed redundant css 2024-07-06 14:36:27 -04:00
Daniel Cojocea 59f8acff1c Refactored Alert component 2024-07-06 14:33:36 -04:00
MuhammadKhalilzadeh e7fb6a9e60 small changes 2024-07-06 09:03:09 +03:30
Mohammad Khalilzadeh 9a9200c68e Merge branch 'bluewave-labs:master' into backend-completion 2024-07-06 08:50:43 +03:30
MuhammadKhalilzadeh 30a0cdd11c replace decode with verify 2024-07-06 08:48:58 +03:30
Alexander Holliday 419eab3d2a Merge pull request #271 from bluewave-labs/fix/select-error
Fixed select error in getUserByEmail
2024-07-05 15:33:53 -07:00
Alex Holliday 30c9c1d0a3 Removed test upload component 2024-07-05 14:41:27 -07:00
Alex Holliday 4e1f0095a7 Removed animation from chart 2024-07-05 14:38:16 -07:00
Alex Holliday 08a9850918 Merge branch 'fix/select-error' into feat/MUI-table-and-pagination 2024-07-05 13:32:14 -07:00
Alex Holliday f5e4aa0b0c Fixed select error in getUserByEmail 2024-07-05 13:30:39 -07:00
Alex Holliday 7b04fcb9fe Initial refactor 2024-07-05 13:30:09 -07:00
Alexander Holliday bf0f05d589 Merge pull request #265 from bluewave-labs/feat/recharts
Feat/recharts, resolves #264
2024-07-05 09:48:43 -07:00
terryjung0244 60e18daa15 Fixed as requested: 1. Added maintenance window frame image. 2. Updated font color and size. 2024-07-05 12:22:36 -04:00
MuhammadKhalilzadeh 4f8031a944 Leveraging JWT for Authenticated Access 2024-07-05 10:19:58 +03:30
Mohammad Khalilzadeh a7adb8c04b Merge branch 'bluewave-labs:master' into backend-completion 2024-07-05 09:20:24 +03:30
Alexander Holliday 774c54a3f9 Merge pull request #261 from bluewave-labs/fix/strip-user-image
Removed profile image from user before returning it, #259
2024-07-04 17:55:17 -07:00
Alexander Holliday 532888c938 Merge pull request #263 from bluewave-labs/fix/toast-refactor
Moved Announcements to Toast directory
2024-07-04 16:49:18 -07:00
Alexander Holliday 7cb799c689 Merge pull request #262 from bluewave-labs/fix/monitor-refactor
Readability refactor
2024-07-04 16:48:56 -07:00
Alex Holliday 6f52febca1 Use Recharts to handle charting data. Added floor and ceiling to the normalized data so we don't have extreme outliers 2024-07-04 15:46:33 -07:00
Alex Holliday 8118f181f9 Moved announcements components to Toast component as that's the only place they should be used 2024-07-04 14:17:58 -07:00
Alex Holliday c0dc50ef56 initial refactor 2024-07-04 14:09:17 -07:00
Alex Holliday f97382c88d Removed profile image from user before returning it 2024-07-04 12:00:37 -07:00
Alexander Holliday 6509043b1f Merge pull request #255 from bluewave-labs/fix/job-queue-edit-monitor
Replace job in queue when monitor is edited, resolves #254
2024-07-04 09:57:47 -07:00
MuhammadKhalilzadeh 17337d69b5 small error handling 2024-07-04 11:52:46 +03:30
MuhammadKhalilzadeh a6ccb4d9ed verifyOwnership added on the route 2024-07-04 11:39:18 +03:30
Mohammad Khalilzadeh a2e378f1dd Merge branch 'bluewave-labs:master' into backend-completion 2024-07-04 11:18:30 +03:30
Alex Holliday fc6691e148 Added missing await 2024-07-03 23:19:12 -07:00
Alex Holliday 5d24f3136c Replace job in queue when monitor is edited 2024-07-03 13:55:44 -07:00
Alexander Holliday 6f4e7d6631 Merge pull request #246 from bluewave-labs/feat/incidents-pg-refactor
Incidents page refactor.
2024-07-03 13:23:08 -07:00
Alexander Holliday eb8aa4725a Merge pull request #253 from bluewave-labs/fix/monitor-status
Update monitor status
2024-07-03 13:21:10 -07:00
Alex Holliday 04ff74dcef Update monitor status 2024-07-03 13:19:47 -07:00