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

B dev #79

Merged
merged 101 commits into from
Oct 20, 2023
Merged

B dev #79

merged 101 commits into from
Oct 20, 2023

Conversation

betiniakarandut
Copy link
Collaborator

@betiniakarandut betiniakarandut commented Oct 19, 2023 •
edited
Loading

  1. Merged series of conflicts
  2. Feat: Implemented the ProfileDropDownMenu for talent avatar

betiniakarandut and others added 30 commits October 9, 2023 04:01
@betiniakarandut
Test for talent controllers
c6e6d78
@betiniakarandut
Talent controllers
9a24eb7
@betiniakarandut
Talent route
fe99039
@betiniakarandut
Added talentRoute endpoint
1dfd85d
@betiniakarandut
Package json update
5638bde
@betiniakarandut
Fixed linting issues
e808421
@betiniakarandut
Revert changes
bf0dc0a
@betiniakarandut
Merge conflict resolved
7089394
@betiniakarandut
Accept integration: getTalentById
6e158dd
@betiniakarandut
Fixed no-unsed-var error
031558b
@Ayobami6 @betiniakarandut
test: add test for getall offers endpoint
3d5acb0
@Ayobami6 @betiniakarandut
feat: add talent and auth route to client app
debe613
@Ayobami6 @betiniakarandut
feat: implement initial auth page
eb73dfe
@Ayobami6 @betiniakarandut
feat: implement user toggle auth type
25d23b9 
User can toggle between user signin type, Employer or talent singin
@Ayobami6 @betiniakarandut
chore: bypass eslint error
cbb308e
@Ayobami6 @betiniakarandut
chore: fix eslint unused vars
9bf0bce
@Ayobami6 @betiniakarandut
chore: add package-lock.json to gitignore
1ae5cd3
@Ayobami6 @betiniakarandut
chore: remove package-lock.json from git track
35dd853
@betiniakarandut
B dev (#27)
85af3a9 
* Test for talent controllers

* Talent controllers

* Talent route

* Added talentRoute endpoint

* Package json update

* Fixed linting issues

* Revert changes

* Accept integration: getTalentById

* Fixed no-unsed-var error
@Ayobami6 @betiniakarandut
test: fix failed test for talentcontrollers
eb5e484
@Ayobami6 @betiniakarandut
chore: fix eslint hasOwnProperty
b32fa67
@jojothomas1515 @betiniakarandut
Employer Signup and Login (#34)
14c7aae 
* employerSignup

* employer signup and login

* added a test

* fixed
@Utilitycoder @betiniakarandut
Feat: About us section implemented (#36)
6084aa6 
* feat: made about section

* feat: done with about us page

* fix: linting errors
@Ayobami6 @betiniakarandut
readme update&auth page minimal implementation (#39)
8d5c337 
* docs: update readme with more project information

* feat: integrate auth pg with auth api for talents

* feat: talent signin and signup v1 implementation

* feat: update landing page with logo

* docs: update readme

Changed logo size in readme

* feat: implement talent and employer routing

Implement authentication for talent and employer to redirect to the various pages

* fix: fix eslint error&update project favicon

* bug: change talent onClick toggle to true or false

Changed the employer and talent toggle from the auth form to take in true or false as the onClick setIsTalent param instead of bool negation

* test: fix test assertions in talentController test
@Ayobami6 @betiniakarandut
docs: update readme with more project information
0fad272
@Ayobami6 @betiniakarandut
feat: talent signin and signup v1 implementation
bc9dba6
@Ayobami6 @betiniakarandut
docs: update readme
622ab18 
Changed logo size in readme
@Ayobami6 @betiniakarandut
feat: add seperate models for the following
d5d009a 
certification
experience,
skills,
education and
project
@betiniakarandut
Rebasing staging:Mergeconflict resolved
7c71313
@betiniakarandut
Added talentPagination endpoint
d33c908
@betiniakarandut betiniakarandut added the feature This a new featuer label Oct 19, 2023
Ayobami6
Ayobami6 requested changes Oct 19, 2023
View reviewed changes
Copy link
Owner

@Ayobami6 Ayobami6 left a comment

Choose a reason for hiding this comment

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

Bro, This is a lot of conflict, please pull first from staging to local branch, then fix the conflicts you might, after then make another PR from your updated branch

Ayobami6
Ayobami6 reviewed Oct 19, 2023
View reviewed changes
server/controllers/offerController.ts
Copy link
Owner

Choose a reason for hiding this comment

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

It looks like you have 2 getOfferByTalent and getOfferByEmployer methods here, So it's not allowing the application build or bundle

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Duplicates removed. It is running smooth on my end now.

Ayobami6
Ayobami6 approved these changes Oct 20, 2023
View reviewed changes
Copy link
Owner

@Ayobami6 Ayobami6 left a comment

Choose a reason for hiding this comment

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

Alright thanks, I will fix the test from here

@Ayobami6 Ayobami6 merged commit 5a553ea into staging Oct 20, 2023
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ayobami6 Ayobami6 Ayobami6 approved these changes

@jojothomas1515 jojothomas1515 Awaiting requested review from jojothomas1515

@Utilitycoder Utilitycoder Awaiting requested review from Utilitycoder

Assignees
No one assigned
Labels
feature This a new featuer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@betiniakarandut @Ayobami6 @jojothomas1515 @Utilitycoder