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.

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

Dev into Master #7

Closed
wants to merge 19 commits into from
Closed

Dev into Master #7

wants to merge 19 commits into from

Conversation

MikeBLambert
Copy link
Contributor

No description provided.

sarahflynn and others added 19 commits December 7, 2018 09:50
* Add header buttons, hamburger button, media-queries and animation for mobile header

* Fix small display issues

* Small CSS change

* Remove postcss media-query dependency

* Change palm logo to url rather than local asset to pass jest tests
* Switch logo url from hard-coded into header to a variable in assets folder that is exported

* Add routerRoutes function to routes.js to all for easier adding of components and associated routes

* Create presentational auth component and accompanying tests. Still need to figure out how to update login type

* Add package.json and package-log.json to gitignore
* using yarn instead of npm,  updated pkg names, links, start scrpt

* first two agency tests passing, error handler fixed

* business email fix

* making a copy of my yarn package.json
* Switch logo url from hard-coded into header to a variable in assets folder that is exported

* Add routerRoutes function to routes.js to all for easier adding of components and associated routes

* Create presentational auth component and accompanying tests. Still need to figure out how to update login type

* Add package.json and package-lock.json to gitignore

* Add auth container and a redirection to the appropriate login/signup page

* Add mock routes to jest Auth.test.js

* Small change to gitignore
* fixed jest error (again), 2nd agency test red

* agency 2nd test green

* 3rd agency test red

* 3rd agencies test green

* 4th agency test red

* agency test 4 green

* 5th agencies test red

* 5th agencies test passing

* users model done

* updated user model

* users  portion of seed file done

* users test 1 red

* user sign up passing

* wrote red test for get all users

* get all users passing

* get users by id failing

* get users by id passing

* delete user by id passing

* wrote failing test for user update

* update user passing

* wrote failing password hash test

* password hash test passing

* compare password test passing

* sign in passing

* rejects sign in with bad password passing

* test for rejecting sign in with good token from other user but bad pwd

* verify user test red

* still working on verify test

* user verify test passing

* linter error fix

* yarn install

* merge w/ a few lingering errors in user tests

* error handler fixed, all tests passing

* switched back to npm
* fixed jest error (again), 2nd agency test red

* agency 2nd test green

* 3rd agency test red

* 3rd agencies test green

* 4th agency test red

* agency test 4 green

* 5th agencies test red

* 5th agencies test passing

* users model done

* updated user model

* users  portion of seed file done

* users test 1 red

* user sign up passing

* wrote red test for get all users

* get all users passing

* get users by id failing

* get users by id passing

* delete user by id passing

* wrote failing test for user update

* update user passing

* wrote failing password hash test

* password hash test passing

* compare password test passing

* sign in passing

* rejects sign in with bad password passing

* test for rejecting sign in with good token from other user but bad pwd

* verify user test red

* still working on verify test

* user verify test passing

* linter error fix

* yarn install

* added nanny profile

* yarn install

* merge w/ a few lingering errors in user tests

* added nannies seed data
* Auth actions written and tested (except for error)

* Add refresh session and updateSessionToken tests, as well as middleware

* CREATE_SESSION reducer test passing after giant mocking debaucle

* Session loading action tested in reducer

* Auth reducer tests passing

* Merge dev into user/auth-redux
* created family profile schema

* added agency alias to make sign in from the front end easier

* create family test red

* first family test passing

* Update families.js
)

* changed to npm

* package json

* first nanny test written and failing

* first nanny test passing

* second nanny test passing

* third nannies test written and failing

* third nanny test passing able to get by id

* delete nanny test written and failing

* delete nanny by id

* update nanny test writen and failing

* final nanny test passing
…into errors on front end (#15)

* changed to npm

* package json

* first nanny test written and failing

* first nanny test passing

* second nanny test passing

* third nannies test written and failing

* third nanny test passing able to get by id

* delete nanny test written and failing

* delete nanny by id

* update nanny test writen and failing

* final nanny test passing

* fixed models and seed data
* Auth actions written and tested (except for error)

* Add refresh session and updateSessionToken tests, as well as middleware

* CREATE_SESSION reducer test passing after giant mocking debaucle

* Session loading action tested in reducer

* Auth reducer tests passing

* Merge dev into user/auth-redux

* minor eslint fix

* linter error

* Session selectors written and tested
* get families test red

* get all families passing

* get family by id test red

* get family by id test passed

* delete family by id test red

* deletes a family by id green

* updates a family by id red

* updates a family by id green
… now working. (#18)

* user auth passing for one route

* added admin token to seed data

* auth added to get by id

* added auth to agency delete

* added auth to put route for agencies

* creating tokens for all other roles
* Auth actions written and tested (except for error)

* Add refresh session and updateSessionToken tests, as well as middleware

* CREATE_SESSION reducer test passing after giant mocking debaucle

* Session loading action tested in reducer

* Auth reducer tests passing

* Merge dev into user/auth-redux

* minor eslint fix

* linter error

* Session selectors written and tested

* Add withSession component and NannyProfile presentational component

* Update Profile presentational component

* Can successfully add user

* User and token are generated at login

* Small change to reducer test

* Style auth page and change header positioning

* Add HeaderContainer to conditionally render Log In and Log Out buttons

* Fix redirect route in withSession

* Fix desktop header link layout to get links to float to the right

* Add session props to Header for conditional render of Log In and Log Out

* Create HeaderContainer to map session to Header

* Fix mobile nav

* Switch signin routes to send back only token
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants