Commit Graph

349 Commits

Author SHA1 Message Date
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
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
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
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
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
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
M M
41b65c1f3b Merge remote-tracking branch 'upstream/master' into feat/details-pg 2024-07-07 17:57:20 -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
Alex Holliday
6a7a919789 Use react table instead of data grid for performance 2024-07-06 21:59:41 -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
M M
8804597221 Added JSDocs. 2024-07-05 21:24:59 -07:00
M M
cf447beb41 Added some functions to get the ball rolling on how we will tackle populating the table with the correct values. 2024-07-05 21:21:57 -07:00
M M
1e49e385f0 Populated the details page table with dummy data. 2024-07-05 21:08:06 -07:00
M M
43e9ede5b6 Got rid of index key. 2024-07-05 20:37:22 -07:00
M M
149bec23eb Fixed rendering issues when no monitor data is displayed. 2024-07-05 20:32:54 -07:00
M M
41850b18c0 Setup component with actual props. 2024-07-05 19:51:07 -07:00
M M
c97a5c022e Merge remote-tracking branch 'upstream/master' into feat/details-pg 2024-07-05 18:03:16 -07:00
Daniel Cojocea
28c3616004 Fixed save picture functionality 2024-07-05 19:52:29 -04:00
Daniel Cojocea
3fd819293c Merge remote-tracking branch 'upstream/master' into feat/image-upload 2024-07-05 19:01:29 -04:00
Daniel Cojocea
6c645ba500 Removed ref 2024-07-05 18:48:32 -04: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
7b04fcb9fe Initial refactor 2024-07-05 13:30:09 -07:00
Daniel Cojocea
d7c1972c99 Added input ref to track file 2024-07-05 14:43:29 -04: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
Daniel Cojocea
5807990342 Refactored some of the code 2024-07-04 20:47:23 -04: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
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
Daniel Cojocea
bef0ad797b Merge remote-tracking branch 'upstream/master' into feat/image-upload 2024-07-04 12:58:51 -04:00
M M
4d8d529f45 Added the 4 boxes at the top. 2024-07-03 20:42:39 -07:00