full CRUD for nanny availability + put for appointments #27

sarahflynn · 2018-12-11T21:47:43Z

No description provided.

* 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

MackenzieBerliner-Glasser

this looks good to me!

* 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 * Add/appointment slice (#24) * 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 * added method on user model to get profile and user off body and posting (#25) * have agency sending alias to db (#26) * Create profile component (#28) * Snapshot changes * Create NannyProfileContainer and send in session as state * updateProfile action created and tested * Add updateProfile conditional logic to NannyProfile component * Merge conflicts * full CRUD for nanny availability + put for appointments (#27) * 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 travis to deploy master and dev to heroku (#29) * added to travis for testing to heroku deploy * exit 0 * tests passing on branch merge? * added services to travis * Profile (#30) * Change session test to pass with profile being sent back. Working on signOut * Fix signUp route * password hash no longer returned on user queries (#33) * fixes to appointment request model and tests (#34) * using user ids instead of profile ids * fixed requested appointment model (user instead of profile ids, status) * fixed test * Fix/connect mongo uri (#36) * switched uri to connect to proper db * added env to travis * merge dev * finally fixed some tests * linter fixes * Fix/appointment model (#37) * using user ids instead of profile ids * fixed requested appointment model (user instead of profile ids, status) * fixed appointment model (user ref & projected/final payments) * error fixes * swtched to npm for build * route fix * put route fix * added new api key for heroku (#39) * tiny fix in availability model (#40) * tiny fix in availability model * seed data availability fix * seed data fix * fixed connect * commented out failing test to help diagnosis * fixed async problems * removing test for diagnosis * removed another availability test * process of elimination * process of elimination * switched from drop collection to delete many in seed data file * uncommented tests * Finish profile (#41) * Change session test to pass with profile being sent back. Working on signOut * Fix signUp route * Profile of existing user rendering on NannyProfile page * Reducer and action tests written and passing * Create FamilyProfile component, ProfileContainer, and Profile components which conditionally render depending on whether it's a family or nanny * Can remove children from families component * State selector box in FamilyProfile component works * Put working on FamilyProfile * add put to nanny profile * added post new profile to nanny * added post for family * Comment out routes in NannyProfile component * Make most of the profile pages' required input fields required. Still need to figure out family birthdays * Update snapshot * Make birthday family date field not required * Send agency and user info for nanny when creating profile * Family dashboard (#42) * Change session test to pass with profile being sent back. Working on signOut * Fix signUp route * Profile of existing user rendering on NannyProfile page * Reducer and action tests written and passing * Create FamilyProfile component, ProfileContainer, and Profile components which conditionally render depending on whether it's a family or nanny * Can remove children from families component * State selector box in FamilyProfile component works * Put working on FamilyProfile * add put to nanny profile * added post new profile to nanny * added post for family * Comment out routes in NannyProfile component * Make most of the profile pages' required input fields required. Still need to figure out family birthdays * Update snapshot * Make birthday family date field not required * Send agency and user info for nanny when creating profile * Set up DB scaffolding * Refactor Dashboard component * Linter error * Nanny scheduling (#43) * Add react-date-picker * Add react date picker component * Add datepicker css * Nanny schedule availability post successful * Componentize Range * Add/family schedule comp (#44) * route to back end written * action for create request started * added fixture * action test for post request working * reducer added for request * added request selector for posts * selectors for family request have passing tests * finally have a form partially rendered * form submits * passing: gets a list of all available times for one nanny by user id (#46) * Display availability (#47) * Add AppContainer to conditionally render the header * Add error messages to auth * Add css to range component * Fix Range to only submit if dates are not null * Update LOAD_START and LOAD_END action creators to make them more universal * Create availability display component * Get Header back in passing state * Add action creator, service, and reducer actions for fetching availability * Delete Availability test * Add loading component to auth * Updated availability list available when availability submitted * Can add and delete nanny availability * All tests passing before merging dev * Add/family appointment request in progress (#48) * added actions reducers and selectors * added filtered container * FilteredNannies * render works for nanny schedule * added new react dependency * added dates to pass to range comp * search term is added to local state * added fetch to submit for search * changed fetch route to proper name * Add/appointment list e2e (#49) * 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 * Add/filtered nannys route (#50) * added query string to frontend route * added functionality to route and is failing * added filter for request * merge with dev * fixed test * deployment (#51) * Complete appointment request (#52) * Add admin dashboard * Filtered nanny going properly into reducer * Add checkboxes to filtered nannies * REQUEST CREATED * Cleanup before merging dev * almost full functionality on appointments and request lists and detail 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 * Add/deployment seeding (#56) * deployment seed data started * deployment seed data * seed script added * added some more info, changed script to include babel-node * added changes to seed data (#57) * improved detail views on appointments and requests, new back end route 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 * added userid to request instead of nannieid (#58) * deploy (#59) * changed path * changed another path * Finish CSS and other fun stuff. (#60) * 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 * Add/about page (#61) * added more to about page * decided to push to sign in home * sarah bio * added final stuff * Order appointments and requests (#63) * 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 * Redirects (#65) * 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 * Remove drop from seedData * travis key for deploy

* 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

* Initial commit * 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 * Dev Into Master!!! (#22) * 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 * 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 * Add/appointment slice (#24) * 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 * added method on user model to get profile and user off body and posting (#25) * have agency sending alias to db (#26) * Create profile component (#28) * Snapshot changes * Create NannyProfileContainer and send in session as state * updateProfile action created and tested * Add updateProfile conditional logic to NannyProfile component * Merge conflicts * full CRUD for nanny availability + put for appointments (#27) * 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 travis to deploy master and dev to heroku (#29) * added to travis for testing to heroku deploy * exit 0 * tests passing on branch merge? * added services to travis * Profile (#30) * Change session test to pass with profile being sent back. Working on signOut * Fix signUp route * password hash no longer returned on user queries (#33) * fixes to appointment request model and tests (#34) * using user ids instead of profile ids * fixed requested appointment model (user instead of profile ids, status) * fixed test * Fix/connect mongo uri (#36) * switched uri to connect to proper db * added env to travis * merge dev * finally fixed some tests * linter fixes * Fix/appointment model (#37) * using user ids instead of profile ids * fixed requested appointment model (user instead of profile ids, status) * fixed appointment model (user ref & projected/final payments) * error fixes * swtched to npm for build * route fix * put route fix * added new api key for heroku (#39) * tiny fix in availability model (#40) * tiny fix in availability model * seed data availability fix * seed data fix * fixed connect * commented out failing test to help diagnosis * fixed async problems * removing test for diagnosis * removed another availability test * process of elimination * process of elimination * switched from drop collection to delete many in seed data file * uncommented tests * Finish profile (#41) * Change session test to pass with profile being sent back. Working on signOut * Fix signUp route * Profile of existing user rendering on NannyProfile page * Reducer and action tests written and passing * Create FamilyProfile component, ProfileContainer, and Profile components which conditionally render depending on whether it's a family or nanny * Can remove children from families component * State selector box in FamilyProfile component works * Put working on FamilyProfile * add put to nanny profile * added post new profile to nanny * added post for family * Comment out routes in NannyProfile component * Make most of the profile pages' required input fields required. Still need to figure out family birthdays * Update snapshot * Make birthday family date field not required * Send agency and user info for nanny when creating profile * Family dashboard (#42) * Change session test to pass with profile being sent back. Working on signOut * Fix signUp route * Profile of existing user rendering on NannyProfile page * Reducer and action tests written and passing * Create FamilyProfile component, ProfileContainer, and Profile components which conditionally render depending on whether it's a family or nanny * Can remove children from families component * State selector box in FamilyProfile component works * Put working on FamilyProfile * add put to nanny profile * added post new profile to nanny * added post for family * Comment out routes in NannyProfile component * Make most of the profile pages' required input fields required. Still need to figure out family birthdays * Update snapshot * Make birthday family date field not required * Send agency and user info for nanny when creating profile * Set up DB scaffolding * Refactor Dashboard component * Linter error * Nanny scheduling (#43) * Add react-date-picker * Add react date picker component * Add datepicker css * Nanny schedule availability post successful * Componentize Range * Add/family schedule comp (#44) * route to back end written * action for create request started * added fixture * action test for post request working * reducer added for request * added request selector for posts * selectors for family request have passing tests * finally have a form partially rendered * form submits * passing: gets a list of all available times for one nanny by user id (#46) * Display availability (#47) * Add AppContainer to conditionally render the header * Add error messages to auth * Add css to range component * Fix Range to only submit if dates are not null * Update LOAD_START and LOAD_END action creators to make them more universal * Create availability display component * Get Header back in passing state * Add action creator, service, and reducer actions for fetching availability * Delete Availability test * Add loading component to auth * Updated availability list available when availability submitted * Can add and delete nanny availability * All tests passing before merging dev * Add/family appointment request in progress (#48) * added actions reducers and selectors * added filtered container * FilteredNannies * render works for nanny schedule * added new react dependency * added dates to pass to range comp * search term is added to local state * added fetch to submit for search * changed fetch route to proper name * Add/appointment list e2e (#49) * 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 * Add/filtered nannys route (#50) * added query string to frontend route * added functionality to route and is failing * added filter for request * merge with dev * fixed test * deployment (#51) * Complete appointment request (#52) * Add admin dashboard * Filtered nanny going properly into reducer * Add checkboxes to filtered nannies * REQUEST CREATED * Cleanup before merging dev * almost full functionality on appointments and request lists and detail 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 * Add/deployment seeding (#56) * deployment seed data started * deployment seed data * seed script added * added some more info, changed script to include babel-node * added changes to seed data (#57) * improved detail views on appointments and requests, new back end route 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 * added userid to request instead of nannieid (#58) * deploy (#59) * changed path * changed another path * Finish CSS and other fun stuff. (#60) * 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 * Add/about page (#61) * added more to about page * decided to push to sign in home * sarah bio * added final stuff * Order appointments and requests (#63) * 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 * Redirects (#65) * 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 * Remove drop from seedData * travis key for deploy * Fix css reloading on refresh issue * Fix CSS loader issue, rewrite readme to make more readable, and change background and logo * uninstall newrelic * Small fixes * Fix duplicate Auth.test * update snapshot

sarahflynn added 12 commits December 11, 2018 10:13

nanny availability schema created

27b03c7

wrote seed data helpers for available times

adcff6a

wrote failing test for AvailableTimes post

86e726a

available times post test passing

ce63d07

available get all times passing

66eaa83

availability get by id and delete by id passing

01cb63a

availability update passing

72ebf37

added update appointment to appointment routes and tests, passing

d02cd51

merge dev into add/nanny-availability

e3a25bd

merge dev into nanny-availability

070fb21

merging new dev to branch

0aa989d

MackenzieBerliner-Glasser approved these changes Dec 11, 2018

View reviewed changes

sarahflynn merged commit 79715cb into dev Dec 11, 2018

MikeBLambert deleted the add/nanny-availability branch February 3, 2019 19:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

full CRUD for nanny availability + put for appointments #27

full CRUD for nanny availability + put for appointments #27

sarahflynn commented Dec 11, 2018

MackenzieBerliner-Glasser left a comment

full CRUD for nanny availability + put for appointments #27

full CRUD for nanny availability + put for appointments #27

Conversation

sarahflynn commented Dec 11, 2018

MackenzieBerliner-Glasser left a comment

Choose a reason for hiding this comment