Commit Graph

310 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alex Holliday f97aa1ca8c Return user and Token instead of decoding token. Added transform to not store image in redux store 2024-07-03 12:20:30 -07:00
Alex Holliday 9a382210b6 Added admin role to registration 2024-07-03 11:21:14 -07:00
M M 971518d70e Added JSDocs. 2024-07-02 21:19:44 -07:00
M M 99f460c80a Added header. 2024-07-02 21:13:29 -07:00
M M f7e8e69168 Added icon to filter by status dropdown. 2024-07-02 21:07:15 -07:00
M M 8453542777 Got rid of the adornment at the end. 2024-07-02 20:46:28 -07:00
M M c9ca639f23 Added the filter by status dropdown to the page. 2024-07-02 20:43:39 -07:00
M M c2b47e5cc4 Placed the TableContainer in a box to better match figma design. 2024-07-02 20:24:51 -07:00
terryjung0244 7d27a72f62 Issue 225: update maintenance checklist component structure 2024-07-02 21:44:03 -04:00
Alex Holliday 033101c884 Added dependency array and catch block 2024-07-02 15:57:53 -07:00
Alex Holliday 299dadd24d Check for admin, redirect to register/login as appropriate 2024-07-02 15:54:49 -07:00
Alex Holliday b563c44f38 Merge remote-tracking branch 'upstream/master' into feat/redirect-on-no-admin 2024-07-02 14:39:47 -07:00
Alexander Holliday 65d55c239f Merge pull request #244 from bluewave-labs/feat/picture-validation
Added validation to picture uploads, resolves #213
2024-07-02 12:58:12 -07:00
Daniel Cojocea 5cbe916a94 Added missing proptype and jsdocs 2024-07-02 14:56:02 -04:00
Daniel Cojocea 92c7816623 Added validation to picture uploads 2024-07-02 14:51:31 -04:00
Alex Holliday cee88f63d9 Make axios request 2024-07-02 11:14:12 -07:00
Alexander Holliday c545a704ac Merge branch 'master' into feat/image-upload 2024-07-02 11:00:48 -07:00
Alex Holliday 53bd2cacdc Added local state 2024-07-02 10:50:18 -07:00
terryjung0244 5cd7e362e9 Define an array of maintenance item and Map maintenance items array to ListItem components with icons 2024-07-02 13:41:59 -04:00
terryjung0244 c8cdcd88a6 Issue 225: Add basic structure for Incidents Component 2024-07-01 22:30:57 -04:00
Alex Holliday 20301d1933 removed stub method 2024-07-01 11:50:35 -07:00
M M b7a35a67b1 Added statuses to label prop types and fixed console errors. 2024-06-29 17:26:19 -07:00
M M 264410ca91 Fixed import statement. 2024-06-29 17:07:04 -07:00
M M b4e6d7b7c0 Merge remote-tracking branch 'upstream/master' into feat/incidents-page 2024-06-29 14:56:26 -07:00
M M e4c29e77aa quick fix for eslint. 2024-06-28 18:00:09 -07:00
M M d954b58766 Added styling to the labels. 2024-06-28 17:42:28 -07:00
Daniel Cojocea df27ae8976 Added proptypes and jsdocs 2024-06-28 20:09:34 -04:00
Daniel Cojocea c87daa3d53 Refactored some of the component code and removed unnecessary params 2024-06-28 20:05:08 -04:00
M M b254c9058e Added status labels to table. 2024-06-28 17:00:33 -07:00
M M ecd3b6f8db Change table to 3 rows. 2024-06-28 16:41:27 -07:00
M M 02339e9cde Merge remote-tracking branch 'upstream/master' into feat/incidents-page 2024-06-28 16:35:02 -07:00