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

Pull dev branch changes into CHE-167 Story branch #146

Merged
merged 108 commits into from
Jun 15, 2024
Merged

Pull dev branch changes into CHE-167 Story branch #146

merged 108 commits into from
Jun 15, 2024

Conversation

seantokuzo
Copy link
Contributor

gitshit

brok3turtl3 and others added 30 commits May 14, 2024 15:09
@brok3turtl3
CHE-155 Updated dev compose to spin up a postgres db container
f9692ca
@brok3turtl3
CHE-155 Added depends_on directive
d05689f
@brok3turtl3
CHE-155 Testing database hook ups
e62b749
@brok3turtl3
CHE-155 pushing up code to bring another station
694c559
@brok3turtl3
CHE-155 test commits
6313c8c
@brok3turtl3
CHE-155 Database connection established in dev container
a371b98
@brok3turtl3
CHE-155 CHanging approach to facilitate db seeding
d3fd3b9
@brok3turtl3
CHE-155 Placeholder Applications page, Router hooked up and basic api…
41606a0 
… and fetch tested
@brok3turtl3
CHE-155 Removed unnecessary logs, imorts and empty lines
24aa0a1
@brok3turtl3
Merge pull request #112 from Code-Hammers/CHE-155/subtask/Create-Post…
b61eb7e 
…greSQL-Dev-Environment

[CHE-155] Create PostgreSQL Dev Environment
@brok3turtl3
CHE-157 Expanded on applications tables
c8c7b2f
@brok3turtl3
Merge branch 'CHE-140/epic/Create-Job-Application-Tracker' into CHE-1…
1f3dbdf 
…57/task/Update-PostgreSQL-Tables
@brok3turtl3
CHE-159 Created basic CreateApplicationPage
32d636d
@brok3turtl3
CHE-159 Added Create Application button and hooked up routing to Crea…
6f144e9 
…teApplicationPage
@brok3turtl3
Merge pull request #115 from Code-Hammers/CHE-157/task/Update-Postgre…
0800b0a 
…SQL-Tables

[CHE-157] Update PostgreSQL Tables
@brok3turtl3
Merge branch 'CHE-141/story/Create-New-Application' into CHE-159/subt…
4d5f33c 
…ask/Create-New-Application-Page
@brok3turtl3
CHE-159 Added local state for formData, handleChange functionality an…
2d3bc44 
…d first input field for form
@brok3turtl3
CHE-159 Murdered a period
58a05e4
@brok3turtl3
CHE-159 Added more input fields
1ca4ab3
@brok3turtl3
CHE-159 Remaining fields added to initial form set up
b670661
@brok3turtl3
CHE-159 Implemented status dropdown and dynamic database fetching for…
9182764 
… valid status options
@brok3turtl3
CHE-159 Removed boken comment code
3ca6e9a
@brok3turtl3
CHE-160 Built basic applicationSlice, added typing and hooked up to s…
8d5e48d 
…tore
@brok3turtl3
Built basic applicationsSlice and hooked up to store
b9e6862
@brok3turtl3
Merge pull request #117 from Code-Hammers/CHE-160/subtask/Implement-R…
053cdbf 
…TK-State-Management-For-Applications

[CHE-160] Implement RTK State Management For Applications
@brok3turtl3
Merge branch 'CHE-141/story/Create-New-Application' into CHE-159/subt…
3a507e8 
…ask/Create-New-Application-Page
@brok3turtl3
Merge pull request #116 from Code-Hammers/CHE-159/subtask/Create-New-…
7bddf1c 
…Application-Page

[CHE-159] Create New Application Page
@brok3turtl3
CHE-161 Updated submit button to show a status, added onSubmit to for…
98aec82 
…m and builthandleSubmit function
@brok3turtl3
CHE-161 Added createApplication controller and required route
6631292
@brok3turtl3
CHE-161 troubleshooting
7484da0
brok3turtl3 and others added 24 commits June 8, 2024 12:11
@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
@brok3turtl3
CHE-189 Code cleanup
8078b75
@brok3turtl3
CHE-192 Updated getAllApplications to handle optional filter paramete…
e3c9a35 
…rs for status and date
@brok3turtl3
CHE-192 Application page updated with toggles for filters
2fd76b4
@brok3turtl3
Merge pull request #135 from Code-Hammers/CHE-189/story/Create-Inacti…
f185cde 
…vity-Alert-System

[CHE-189] Create Inactivity Alert System
@brok3turtl3
Merge branch 'CHE-140/epic/Create-Job-Application-Tracker' into CHE-1…
d2e2ebe 
…92/story/Create-Filters
@brok3turtl3
CHE-192 Debugging logic
ea52856
@brok3turtl3
CHE-192 Code tweaks to ensure stamps are consistent across files
542c8c8
@brok3turtl3
CHE-192 Code cleanup
fd5e428
@brok3turtl3
CHE-192 Typing update
46a19db
@brok3turtl3
CHE-192 Typing...
c5e6b43
@brok3turtl3
CHE-192 Updated image for lint and test compose, added credentials fo…
541811c 
…r postgres to dev container and code cleanup
@brok3turtl3
Merge remote-tracking branch 'origin/CHE-192/story/Create-Filters' in…
e80982e 
…to CHE-192/story/Create-Filters
@brok3turtl3
CHE-192 Basic validation that stops user from picking a future date w…
3b5f0c2 
…hen creating an application
@brok3turtl3
Merge pull request #139 from Code-Hammers/CHE-192/story/Create-Filters
d5090c2 
[CHE-192] Create Filters
@brok3turtl3
CHE-140 Docker cleanup
f5d95f9
@brok3turtl3
CHE-140 image updates
8cd003e
@brok3turtl3
CHE-140 Update docker-remove-all script files
822a378
@brok3turtl3
Merge pull request #144 from Code-Hammers/CHE-140/epic/Create-Job-App…
74f4dd2 
…lication-Tracker

[CHE-140] Create Job Application Tracker
@seantokuzo
Merge branch 'dev' of https://github.com/Code-Hammers/code-hammers in…
174f8c5 
…to CHE-167/story/BE-Refactor-Error-Handling
@seantokuzo
Merge branch 'CHE-167/story/BE-Refactor-Error-Handling' of https://gi…
3e6bc86 
…thub.com/Code-Hammers/code-hammers into CHE-167/story/BE-Refactor-Error-Handling
@seantokuzo seantokuzo requested a review from brok3turtl3 June 15, 2024 02:47
@seantokuzo
Copy link
Contributor Author

@brok3turtl3 dev branch has a problem - using image ch-dev-dep-v2 in github workflow but using ch-dev-dep-v3 in lint and test compose files

brok3turtl3
brok3turtl3 approved these changes Jun 15, 2024
View reviewed changes
Copy link
Contributor

@brok3turtl3 brok3turtl3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch - Ill sort the flow out today.

@brok3turtl3 brok3turtl3 merged commit 9f774cc into CHE-167/story/BE-Refactor-Error-Handling Jun 15, 2024
1 check passed
@brok3turtl3 brok3turtl3 deleted the CHE-167/Dev-Branch-Pull branch June 15, 2024 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brok3turtl3 brok3turtl3 brok3turtl3 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@seantokuzo @brok3turtl3