Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Dev To Main #162

Open
wants to merge 452 commits into
base: main
Choose a base branch
from
Open

Merge Dev To Main #162

wants to merge 452 commits into from

Conversation

brok3turtl3
Copy link
Contributor

Description

This PR merges dev to main and brings the production environment to current.

Jira Task

N/A

Testing Instructions

N/A

Checklist

All Team Members

  • I added a descriptive title to this PR.
  • I filled out the Description, Jira Task, and Testing Instructions sections above.
  • I added or updated [Jest unit tests]for any changes to components, server-side controllers, etc.
  • I ran npm run docker-test in my local environment to check that this PR passes all unit tests.
  • I did a quick check to make sure my code changes follow the recommended style guide.

Additional Notes, Images, etc.

N/A

brok3turtl3 and others added 30 commits June 7, 2024 15:56
@brok3turtl3
CHE-189 Pause notifications functionality added
edeb8b3
@emmagawd
CHE-125 added email field to create method
3f01780
@brok3turtl3
CHE-189 Added inactivity period controls for user
4fbe93d
@brok3turtl3
CHE-189 Adjusted auth check logic for updates and period calculations…
9a4c998 
… for testing
@brok3turtl3
CHE-169 Updated image removal script
3fd0c53
@Mnelson98
Merged with latest story branch, CHE-113
4d06a88
@Mnelson98
Removed unecessary import and first name from editProfilePage
124bb14
@brok3turtl3
Merge pull request #131 from Code-Hammers/CHE-169/subtask/Add-Express…
08628cd 
…-Async-Errors-Dep

[CHE-169] Add Express Async Errors Dep
@Mnelson98
Stopped skills from being added to specializations when hitting remov…
a2608ac 
…e button
@Mnelson98
Added case check to skills input and refactored networking box for sc…
a7f2d2d 
…reen reader compliance
@Mnelson98
validating skill before calling the setFormData function
0b935dc
@Mnelson98
removed first and last name from profileController and moved the skil…
2a99fc7 
…ls useState
@Mnelson98
cleaned up formatting
0c77aa6
@brok3turtl3
CHE-189 Code clean up for linter
fc44442
@brok3turtl3
Code cleanup for linter
be2cdf8
@brok3turtl3
Further linting clean up
99b15da
@brok3turtl3
shakes fist at linter
192adad
@brok3turtl3
Prettier formatting updates
f9d07a8
@brok3turtl3
Merge pull request #136 from Code-Hammers/epic-remote-update
a0bd196 
[NO TICKET] Epic Remote Update
@brok3turtl3
Merge branch 'CHE-140/epic/Create-Job-Application-Tracker' into CHE-1…
14f1532 
…89/story/Create-Inactivity-Alert-System
@brok3turtl3
CHE-189 Merge resolutions
72307e0
@brok3turtl3
CHE-189 Linter battle
78530d3
@Mnelson98
added userID to useEffect array
13d0a22
@Mnelson98
created and utilizing reusable component for editProfile inputs
f455fc8
@brok3turtl3
CHE-126 Formatting updates for prettier
0c20ccf
@brok3turtl3
Merge branch 'CHE-113/story/Profiles-Improvements' into CHE-125/subta…
36197fe 
…sk/Auto-Populate-Email-In-Profile-On-Registration
@brok3turtl3
Merge pull request #137 from Code-Hammers/CHE-125/subtask/Auto-Popula…
97efce5 
…te-Email-In-Profile-On-Registration

[CHE-125] Auto Populate Email In Profile On Registration
@brok3turtl3
CHE-189 Code cleanup
8078b75
@seantokuzo
simplify imports of custom error classes
bb6e77e
@seantokuzo
create global error handler middleware to handle custom errors
326cc88
brok3turtl3 and others added 17 commits July 27, 2024 08:55
@brok3turtl3
Merge branch 'dev' into CHE-113/story/Profiles-Improvements
9f2a883
@brok3turtl3
CHE-127 Updated ts-jest version
49845b3
@brok3turtl3
CHE-127 Updated actions workflow file
c4f0d21
@brok3turtl3
Merge branch 'CHE-113/story/Profiles-Improvements' into CHE-127/Add-R…
a17bb0d 
…emaining-Profile-Info-To-Profile-Page
@brok3turtl3
Merge pull request #159 from Code-Hammers/CHE-127/Add-Remaining-Profi…
0d4343e 
…le-Info-To-Profile-Page

Che 127/add remaining profile info to profile page
@brok3turtl3
Merge pull request #155 from Code-Hammers/CHE-197/subtask/Add-PG-to-B…
a59881d 
…E-Test-Setup

[CHE-197] Add PG to BE Test Setup
@brok3turtl3
Merge branch 'dev' into CHE-84/subtask/Create-Tests-And-Error-Handlin…
8608e78 
…g-For-userController-authUser
@brok3turtl3
CHE-84 Replace some path code lost in merge from dev
0e9480c
@brok3turtl3
CHE-84 Removed two empty suites
7dc5b66
@brok3turtl3
CHE-84 Test Suite complete
cd5f274
@brok3turtl3
CHE-84 Updated build-tests.yml
eb9053a
@brok3turtl3
CHE-84 Lint monster made me do this
29929a0
@brok3turtl3
CHE-84 LINT
8217643
@brok3turtl3
Merge pull request #160 from Code-Hammers/CHE-84/subtask/Create-Tests…
4224d74 
…-And-Error-Handling-For-userController-authUser

Che 84/subtask/create tests and error handling for user controller auth user
@brok3turtl3
Merge branch 'dev' into CHE-113/story/Profiles-Improvements
13a88e1
@brok3turtl3
CHE-113 Fixes from merging dev
f19b3f7
@brok3turtl3
Merge pull request #161 from Code-Hammers/CHE-113/story/Profiles-Impr…
1cb7462 
…ovements

[CHE 113] Profiles Improvements
@brok3turtl3 brok3turtl3 self-assigned this Aug 10, 2024
brok3turtl3 and others added 12 commits August 11, 2024 09:07
@brok3turtl3
CHE-203 Removed try/catch and Next import
1aaf5d1
@brok3turtl3
CHE-203 Removed createProfile as it is never used.
ad411eb
@brok3turtl3
CHE-203 cleaned up some unused imports/exports
b01849c
@brok3turtl3
CHE-203 Removed legacy profile controller tests
8932518
@brok3turtl3
167 Refactored target component to use async errors and custom error …
549af69 
…handlers
@brok3turtl3
167 Test Suite complete
7f6c0fd
@brok3turtl3
Linting fixes
7979864
@brok3turtl3
Removed deprecated profile controller test file
4708dda
@brok3turtl3
Updated file to temporarily remove pings to AWS service
f9aecbf
@brok3turtl3
Linting fix
669eb04
@brok3turtl3
Merge pull request #177 from Code-Hammers/167-che-204-be-controller-t…
a40bfc8 
…ests-getallprofiles

[167] BE CONTROLLER TESTS - getallprofiles
@brok3turtl3
Merge pull request #175 from Code-Hammers/CHE-203/BE-CONTROLLER-TESTS…
5d2075a 
…-createProfile

[CHE-203] BE CONTROLLER TESTS - createProfile
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brok3turtl3 brok3turtl3

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@brok3turtl3 @emmagawd @Mnelson98 @seantokuzo