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

Merging Dev to Main #41

Merged
merged 94 commits into from
Mar 14, 2024
Merged

Merging Dev to Main #41

merged 94 commits into from
Mar 14, 2024

Conversation

brok3turtl3
Copy link
Contributor

MERGING DEV TO MAIN.

brok3turtl3 and others added 30 commits September 24, 2023 13:16
@brok3turtl3
Docker set up
f7324ff
@brok3turtl3
Docker setup
253b67a
@brok3turtl3
Docker Setup
aa46ddc
@brok3turtl3
docker-dev script fix
6b4f784
@brok3turtl3
build context added to yaml file
d5ff984
@brok3turtl3
Additional yaml edit to set up explicit build directions for local image
fa8d78b
@brok3turtl3
further yaml edits to troubleshoot remote pulls
3c083aa
@brok3turtl3
README updated to reflect correct instructions for dev env start up
79c12f8
@brok3turtl3
YAML adjusted for dev compose file
794c4c8
@brok3turtl3
Merge pull request #17 from Code-Hammers/docker-prep
6d7de70 
Docker prep
@brok3turtl3
Login component hooked up to state and back end for basic database auth
b7ddc37
@brok3turtl3
Updated auth check for userstate
07eaefa
@brok3turtl3
Updated README with testing credentials, and removed console.log
343038e
@brok3turtl3
Merge pull request #18 from Code-Hammers/login
fbc5d12 
Login
@brok3turtl3
logout button and fuctionality added to Banner
2f76465
@brok3turtl3
Merge pull request #19 from Code-Hammers/logout
6671bd8 
logout button and fuctionality added to Banner
@brok3turtl3
Added testing to Banner to cover new logout button and functionality,…
f44b7cb 
… adjusted mock states to accurately reflect initial states, added error property in userSlice state
@brok3turtl3
added error property to mock initial states
a475391
@brok3turtl3
Merge pull request #20 from Code-Hammers/logout-testing
ecf5813 
Logout testing
@brok3turtl3
Refactored tests to account for changes made to index.ts and various …
538b293 
…routes
@brok3turtl3
Merge pull request #21 from Code-Hammers/be-testing
75714d9 
Refactored tests to account for changes made to index.ts and various …
@brok3turtl3
file structure changes
23a66f5
@brok3turtl3
Merge pull request #22 from Code-Hammers/be-testing
2c8c1be 
file structure changes
@brok3turtl3
Created profile models and types
8bd7bd3
@brok3turtl3
Merge branch 'dev' into profiles
1959cb8
@brok3turtl3
router, controller and createProfile route added for profiles
d5a4eab
@brok3turtl3
getAllProfiles route and controller added
2917ac1
@brok3turtl3
getProfileByID route and controller added
b8310f3
@brok3turtl3
updateProfile route and controller created
959c36f
@brok3turtl3
created testing file for profileController
b05d64d
brok3turtl3 and others added 29 commits November 30, 2023 07:39
@brok3turtl3
Profile page and profileSlice created
fadf724
@brok3turtl3
Banner button functionality augmented to include profile and logout d…
aee0e1d 
…ropdown, Profile page hooked up to router and state
@brok3turtl3
Tests updated for Banner component
df4da08
@brok3turtl3
Refactored Banner tests, added Profile tests
1da2abf
@brok3turtl3
Merge pull request #29 from Code-Hammers/user-profile
e116fbf 
User profile
@brok3turtl3
PR template added
2632b8b
@brok3turtl3
Merge pull request #30 from Code-Hammers/PR-template
d423839 
PR template added
@brok3turtl3
template edited
fcd9dd4
@brok3turtl3
Merge pull request #31 from Code-Hammers/template-PR
cb0cb6c 
template edited
@brok3turtl3
Create pull_request_template.md
a42b78a
@brok3turtl3
Create pull_request_template.md
c4d3b54
@brok3turtl3
Name field added to profile model
814763d
@brok3turtl3
Merge pull request #32 from Code-Hammers/profile-model
11e9988 
Name Field Added to Profile Model
@brok3turtl3
ProfileThumb display component added and model adjusted for first and…
059e2f9 
… last names.
@brok3turtl3
Merge pull request #33 from Code-Hammers/profile-thumb
3cb4dd3 
ProfileThumb Display Component Created for Rendering Profile Thumbs on Profiles Page
@brok3turtl3
Created test file for userSlice
304793b
@brok3turtl3
created user type for front end, added logout test to userSlice test …
a71e044 
…file, updated user typing in userSlice
@brok3turtl3
test for successful login added
06b52d2
@brok3turtl3
test added for connection errors with axios, adjusted thunk logic for…
41df373 
… login
@brok3turtl3
quick fix from a model update error
b20ec55
@brok3turtl3
Update to Profile useEffcet logic to account for possible null value
7efb600
@brok3turtl3
Merge pull request #34 from Code-Hammers/userSlice-tests
1ac1d85 
Add Tests for userSlice
@brok3turtl3
Created testing file for userprofileSlice and added two tests
3e4d841
@brok3turtl3
Added test and updated error key on profileSlice
97fec61
@brok3turtl3
Refactored thunk and testfile
8692571
@brok3turtl3
Merge pull request #35 from Code-Hammers/userProfileSlice-tests
4764e28 
Created testing file for userprofileSlice and added two tests
@brok3turtl3
added docker testing script
bb2814b
@brok3turtl3
typescript help docs added
a2e63b0
@brok3turtl3
Merge pull request #36 from Code-Hammers/documentation
f02945e 
Add TypeScript Guidance To Documentation Files
@brok3turtl3 brok3turtl3 merged commit d2aa24f into main Mar 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@brok3turtl3