Daniel Cojocea
31e4c7b110
Fixed avatar image not displaying
2024-07-08 16:06:12 -04:00
MuhammadKhalilzadeh
7db5433361
Renaming the variable
2024-07-08 22:55:23 +03:30
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
MuhammadKhalilzadeh
3e6b9049ec
Add customization to limiting
2024-07-08 21:32:07 +03:30
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
MuhammadKhalilzadeh
98be150d6d
extre imports and constants removed
2024-07-08 21:07:14 +03:30
MuhammadKhalilzadeh
e76bee70d6
Error handling removed
2024-07-08 21:05:41 +03:30
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
MuhammadKhalilzadeh
de6d2457c0
Merge branch 'limit-checks' of https://github.com/MuhammadKhalilzadeh/bluewave-uptime into limit-checks
2024-07-08 10:51:49 +03:30
MuhammadKhalilzadeh
6589d0ef06
limiting getChecks to the last 25 checks
2024-07-08 10:50:57 +03:30
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
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
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
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