Commit Graph

554 Commits

Author SHA1 Message Date
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 440716b021 Merge remote-tracking branch 'upstream/master' into fix/remove-image-from-returned-user 2024-07-03 12:07:43 -07:00
Alexander Holliday fd52943870 Merge pull request #250 from bluewave-labs/feat/registration-role
Added admin role to registration, resolves #249
2024-07-03 12:07:20 -07:00
Alex Holliday 59992b4ac8 Remove profileImage from returned user 2024-07-03 11:59:24 -07:00
Alex Holliday 9a382210b6 Added admin role to registration 2024-07-03 11:21:14 -07:00
Alexander Holliday 3a1bd48d89 Merge pull request #248 from bluewave-labs/feat/profile-picture-update-endpoint
Added image bytes to update user profile, resolves #247
2024-07-03 10:26:30 -07:00
Alex Holliday da1e8ee5d9 Added image bytes to update user profile 2024-07-03 10:23:16 -07:00
Alexander Holliday 9532fa6fb5 Merge pull request #245 from bluewave-labs/feat/redirect-on-no-admin
Feat/redirect on no admin, resolves #232
2024-07-03 09:53:15 -07: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 75d16b749d Merge pull request #243 from bluewave-labs/feat/check-admin
Feat/check admin, resolves #241
2024-07-02 14:22:05 -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
Alexander Holliday 7d78d054ba Merge pull request #231 from bluewave-labs/feat/image-upload
Feat/image upload, resolves #221
2024-07-02 12:33:49 -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 acd96989cc Merge remote-tracking branch 'upstream/master' into feat/redirect-on-no-admin 2024-07-02 11:14:23 -07:00
Alex Holliday cee88f63d9 Make axios request 2024-07-02 11:14:12 -07:00
Alexander Holliday 3760e6b5e7 Merge pull request #238 from bluewave-labs/fix/verify-ownership
Added special case for User document, resolves #237
2024-07-02 11:13:53 -07:00
Alexander Holliday c545a704ac Merge branch 'master' into feat/image-upload 2024-07-02 11:00:48 -07:00
Alex Holliday 9d628008bc Merge remote-tracking branch 'upstream/master' into feat/check-admin 2024-07-02 10:50:39 -07:00
Alex Holliday 53bd2cacdc Added local state 2024-07-02 10:50:18 -07:00
Alexander Holliday 7f24aec2cc Merge pull request #239 from bluewave-labs/feat/user-roles
Added role field to User model, resolves #233
2024-07-02 10:48:56 -07:00
Alex Holliday ec63281202 Return admin account status on check 2024-07-02 10:45:38 -07:00
Alex Holliday c469a01ec5 Updated validation 2024-07-02 10:39:22 -07:00
Alex Holliday d7d6effdda Add route and controller 2024-07-02 10:38:02 -07:00
Alex Holliday 898738e287 Added role field to User model 2024-07-02 10:24:06 -07:00
Alex Holliday 50f219249b Added special case for User document 2024-07-02 10:20:10 -07:00
Alexander Holliday 754079d5c4 Merge pull request #230 from bluewave-labs/feat/incidents-page
Implementation of the Incidents page.
2024-07-02 09:49:17 -07:00
Alex Holliday 20301d1933 removed stub method 2024-07-01 11:50:35 -07:00
Alex Holliday e8d4a5d868 Add profileImage to schema, controllers, and routes 2024-07-01 11:48:56 -07:00
Gorkem Cetin (BWL) 9fef75e824 Fix for contributing.md 2024-06-30 21:36:29 -04:00
Gorkem Cetin (BWL) 8e7c6ceb99 Updates to CONTRIBUTING.md 2024-06-30 21:30:46 -04:00
Gorkem Cetin (BWL) 6c543ffa9c Create PULLREQUESTS.md 2024-06-30 21:17:07 -04: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
Alexander Holliday 61832570c3 Merge pull request #229 from bluewave-labs/feat/create-monitor-refactor
Refactored create monitor page styling using @mui components, resolves #218
2024-06-28 19:39:58 -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
Alexander Holliday 7097c1b59f Merge pull request #220 from bluewave-labs/feat/redirect-on-monitor-create
Redirected user to Monitors page after adding a new monitor
2024-06-27 22:08:33 -07:00
Alexander Holliday 5a58b70711 Merge pull request #223 from bluewave-labs/fix/profile-settings-route
Added account parent route and fixed links
2024-06-27 22:08:19 -07:00
M M 4252e7a1c5 Initial commit for the table of the incidents page. 2024-06-27 21:13:21 -07:00
Alexander Holliday cd5c9db6c4 Merge pull request #212 from windsywinds/master
fix: add css for password input field
2024-06-27 20:58:28 -04:00
Daniel Cojocea 62d545df06 Added account parent route and fixed links 2024-06-27 19:19:36 -04:00