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
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
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
Alexander Holliday
terryjung0244
MuhammadKhalilzadeh
Alexander Holliday
Mohammad Khalilzadeh