30f7ecff82
Fixed gap issue & added search svg
2024-07-08 20:03:27 -04:00
f42facdea0
Changed pagination to reflect Figma design
2024-07-08 19:51:21 -04:00
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
b94d1021c2
Removed unused functions & fixed warning
2024-07-08 16:26:08 -04:00
31e4c7b110
Fixed avatar image not displaying
2024-07-08 16:06:12 -04:00
7f7226d6e5
Merge remote-tracking branch 'upstream/master' into feat/image-upload
2024-07-08 14:06:53 -04:00
4668728cbe
Fixed conflict
2024-07-08 14:05:21 -04:00
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
8622f95b30
Merge pull request #294 from bluewave-labs/feat/table-style
...
Table styling changes. resolves #290
2024-07-08 10:53:13 -07:00
475f7c69ae
Styling changes
2024-07-08 13:42:45 -04:00
43bac259d7
Generate avatar image on register or update if an image is included
2024-07-08 10:26:56 -07:00
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
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
4de1e71344
Merge branch 'master' into feat/issue-225-Maintenance-page
2024-07-07 21:57:44 -07:00
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
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
feb4a8899d
Merge pull request #285 from bluewave-labs/feat/navigate-back
...
Added navigation button, resolves #258
2024-07-07 18:59:00 -07:00
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
41787c538c
Updated navbar user dropdown
2024-07-07 19:15:44 -04:00
89c0ccac56
Added navigation button
2024-07-07 18:25:03 -04:00
0555157200
Added animations back, added pagination
2024-07-06 23:07:04 -07:00
f8cdb8f3a8
Merge pull request #283 from MuhammadKhalilzadeh/front-end-login-textfields
...
textfield login page height fixed
2024-07-06 22:35:11 -07:00
5c9b111707
textfield login page height fixed
2024-07-07 08:59:36 +03:30
43fbbbd4a7
Merge pull request #257 from MuhammadKhalilzadeh/backend-completion
...
Backend completion
2024-07-06 22:19:37 -07:00
ad26d1ba19
Update authController.js
...
Removed log statement
2024-07-06 22:19:02 -07:00
d88ac3c5c4
Update authRoute.js
...
Added userID param back to delete route, needed for middleware functionality
2024-07-06 22:18:23 -07:00
6a7a919789
Use react table instead of data grid for performance
2024-07-06 21:59:41 -07:00
e02b42b86b
Merge pull request #280 from bluewave-labs/feat/alert-refactor
...
Alert component, resolves #279
2024-07-06 13:59:14 -07:00
49f8958418
Added proptypes and jsdocs, and color fix
2024-07-06 14:44:04 -04:00
bf62404247
Removed redundant css
2024-07-06 14:36:27 -04:00
59f8acff1c
Refactored Alert component
2024-07-06 14:33:36 -04:00
e7fb6a9e60
small changes
2024-07-06 09:03:09 +03:30
9a9200c68e
Merge branch 'bluewave-labs:master' into backend-completion
2024-07-06 08:50:43 +03:30
30a0cdd11c
replace decode with verify
2024-07-06 08:48:58 +03:30
28c3616004
Fixed save picture functionality
2024-07-05 19:52:29 -04:00
3fd819293c
Merge remote-tracking branch 'upstream/master' into feat/image-upload
2024-07-05 19:01:29 -04:00
6c645ba500
Removed ref
2024-07-05 18:48:32 -04:00
419eab3d2a
Merge pull request #271 from bluewave-labs/fix/select-error
...
Fixed select error in getUserByEmail
2024-07-05 15:33:53 -07:00
30c9c1d0a3
Removed test upload component
2024-07-05 14:41:27 -07:00
4e1f0095a7
Removed animation from chart
2024-07-05 14:38:16 -07:00
08a9850918
Merge branch 'fix/select-error' into feat/MUI-table-and-pagination
2024-07-05 13:32:14 -07:00
f5e4aa0b0c
Fixed select error in getUserByEmail
2024-07-05 13:30:39 -07:00
7b04fcb9fe
Initial refactor
2024-07-05 13:30:09 -07:00
d7c1972c99
Added input ref to track file
2024-07-05 14:43:29 -04:00
bf0f05d589
Merge pull request #265 from bluewave-labs/feat/recharts
...
Feat/recharts, resolves #264
2024-07-05 09:48:43 -07:00
60e18daa15
Fixed as requested: 1. Added maintenance window frame image. 2. Updated font color and size.
2024-07-05 12:22:36 -04:00
4f8031a944
Leveraging JWT for Authenticated Access
2024-07-05 10:19:58 +03:30
a7adb8c04b
Merge branch 'bluewave-labs:master' into backend-completion
2024-07-05 09:20:24 +03:30
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
5807990342
Refactored some of the code
2024-07-04 20:47:23 -04:00
Daniel Cojocea