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

Fix css loader, improve readme, change background and logo image #68

Merged
merged 71 commits into from
Dec 20, 2018

Conversation

MikeBLambert
Copy link
Contributor

No description provided.

sarahflynn and others added 30 commits December 6, 2018 13:23
* 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
* added redux starter template

* env set up

* Header (#1)

* 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

* Auth presentational component (#3)

* 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

* S file setup (#4)

* 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

* Change root package.json back to non-yarn form and change start script in server package.json to lib directory

* added & test scripts to make switching btwn yarn and npm easy: all work

* Auth container (#5)

* 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

* Users slice (#8)

* 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

* Add/nanny profile (#9)

* 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

* merge fix (#10)

* User/auth redux (#11)

* 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

* Add/families slice (#13)

* 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

* added e2e testing for nanny routes as well as resolved merge issues  (#14)

* 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 to have strings for phone number and zipcode to not run 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/selectors (#12)

* 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

* Finished basic CRUD for family profiles (#16)

* 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

* added roles to begin authorizing routes, admins for agency routes are 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

* Profile component (#21)

* 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
* RequestedAppointment model created

* created seed data for requested appointments, changed birthday format

* removed stray code

* fixed tests

* wrote failing test for request posts

* requestedAppointment post passing

* request get all failing

* request get all passing

* get request by id passing

* delete request by id passing

* update request test passing

* changed line in requests.test.js to es6 syntax

* merged with dev from last night, fixed test
* added redux starter template

* env set up

* Header (#1)

* 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

* Auth presentational component (#3)

* 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

* S file setup (#4)

* 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

* Change root package.json back to non-yarn form and change start script in server package.json to lib directory

* added & test scripts to make switching btwn yarn and npm easy: all work

* Auth container (#5)

* 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

* Users slice (#8)

* 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

* Add/nanny profile (#9)

* 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

* merge fix (#10)

* User/auth redux (#11)

* 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

* Add/families slice (#13)

* 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

* added e2e testing for nanny routes as well as resolved merge issues  (#14)

* 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 to have strings for phone number and zipcode to not run 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/selectors (#12)

* 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

* Finished basic CRUD for family profiles (#16)

* 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

* added roles to begin authorizing routes, admins for agency routes are 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

* Profile component (#21)

* 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

* Basic CRUD for requestedAppointments working, tests passing (#19)

* RequestedAppointment model created

* created seed data for requested appointments, changed birthday format

* removed stray code

* fixed tests

* wrote failing test for request posts

* requestedAppointment post passing

* request get all failing

* request get all passing

* get request by id passing

* delete request by id passing

* update request test passing

* changed line in requests.test.js to es6 syntax

* merged with dev from last night, fixed test
* RequestedAppointment model created

* created seed data for requested appointments, changed birthday format

* removed stray code

* fixed tests

* wrote failing test for request posts

* requestedAppointment post passing

* request get all failing

* request get all passing

* get request by id passing

* delete request by id passing

* update request test passing

* created appointment model

* wrote test seed data for appointments

* changed import in requests.tests.js to es6 syntax

* wrote failing test for appointment post

* need to restart VS Code

* appointment post test passing

* get all appts test red

* get all appts test green

* get appts by id passing

* full CRUD for appointments done
* Snapshot changes

* Create NannyProfileContainer and send in session as state

* updateProfile action created and tested

* Add updateProfile conditional logic to NannyProfile component

* Merge conflicts
* merging basic CRUD for requestedAppointments (#23)

* added redux starter template

* env set up

* Header (#1)

* 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

* Auth presentational component (#3)

* 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

* S file setup (#4)

* 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

* Change root package.json back to non-yarn form and change start script in server package.json to lib directory

* added & test scripts to make switching btwn yarn and npm easy: all work

* Auth container (#5)

* 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

* Users slice (#8)

* 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

* Add/nanny profile (#9)

* 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

* merge fix (#10)

* User/auth redux (#11)

* 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

* Add/families slice (#13)

* 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

* added e2e testing for nanny routes as well as resolved merge issues  (#14)

* 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 to have strings for phone number and zipcode to not run 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/selectors (#12)

* 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

* Finished basic CRUD for family profiles (#16)

* 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

* added roles to begin authorizing routes, admins for agency routes are 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

* Profile component (#21)

* 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

* Basic CRUD for requestedAppointments working, tests passing (#19)

* RequestedAppointment model created

* created seed data for requested appointments, changed birthday format

* removed stray code

* fixed tests

* wrote failing test for request posts

* requestedAppointment post passing

* request get all failing

* request get all passing

* get request by id passing

* delete request by id passing

* update request test passing

* changed line in requests.test.js to es6 syntax

* merged with dev from last night, fixed test

* nanny availability schema created

* wrote seed data helpers for available times

* wrote failing test for AvailableTimes post

* available times post test passing

* available get all times passing

* availability get by id and delete by id passing

* availability update passing

* added update appointment to appointment routes and tests, passing
* added to travis for testing to heroku deploy

* exit 0

* tests passing on branch merge?

* added services to travis
sarahflynn and others added 27 commits December 13, 2018 14:32
* wrote a failing test for 'get appointments by user id' route

* appointments list by family user id passing

* tests for getting appointment list by user id pass for nanny and family

* get appointments action created

* action import path fix

* created get appointments service and reducer

* appointment reducer written

* added appointments to dashboard container

* added request populate to get appointments list route and updated tests

* time to stop for the night

* appointment detail data arriving in component without full profiles

* appointment detail  data arriving in component weirdly formatted

* removed test

* full appointment detail info arriving at component

* switching branches, progress on appointment detail render

* mvp functionality with no styling for appointment list slice done

* fixed dates, extracted date function to helper, fixed state, added link
* added query string to frontend route

* added functionality to route and is failing

* added filter for request

* merge with dev

* fixed test
* Add admin dashboard

* Filtered nanny going properly into reducer

* Add checkboxes to filtered nannies

* REQUEST CREATED

* Cleanup before merging dev
…l views (#54)

* request detail route working

* created request list action & reducer

* progress on vertical slice, fix: userId nt required on Appointments list

* requests and appointments end to end slice rendering and data in state

* cleanup before merge
* deployment seed data started

* deployment seed data

* seed script added

* added some more info, changed script to include babel-node
…e for accept/decline patch (#55)

* deployment seed data started

* appointment and request detail e2e with display to ui working

* removed chance, set default profile avatars, removed incomplete file

* merged dev into branch
* Add admin dashboard

* Filtered nanny going properly into reducer

* Add checkboxes to filtered nannies

* REQUEST CREATED

* Cleanup before merging dev

* Fix profile redirect issue

* Small fix

* Fix load error in test

* Finished profile styles

* Progress towards dashboard componenents

* Fix redirect issue and almost done with request appointment component

* Family request styled

* Small CSS changes

* Appointment detail styled

* Temporarily stop front-end tests
* added more to about page

* decided to push to sign in home

* sarah bio

* added final stuff
* Fix mock files to get front end tests to pass

* Organize dashboard file structure

* Put appointments in table, add button, and styles

* Fix styling of request lists

* Small test fixes

* Add logic to sort appointments and requests so that they show in temporal order

* Delete file mocks in hopes of passing travis

* Fix file mocks

* Remove comments

* Snapshot fix

* Come on Travis...

* Travis travis travis

* Add readme

* Fix path to screenshots in readme
* Change Profile to a class component to handle redirects after profile submission

* Add conditional rendering based on roles to request and appointment details

* Fix textarea error in FamilyRequest

* Fix profile tests to add mock handleRedirect function
Copy link
Contributor

@MackenzieBerliner-Glasser MackenzieBerliner-Glasser left a comment

Choose a reason for hiding this comment

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

this all looks good to me

@MikeBLambert MikeBLambert merged commit e7c7cbb into dev Dec 20, 2018
@MikeBLambert MikeBLambert deleted the fix-css-loader branch February 3, 2019 19:00
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