-
Notifications
You must be signed in to change notification settings - Fork 0
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
feat: send email on schedule edit by admin #140
Merged
akshay2000saxena
merged 7 commits into
staging
from
akshay/feat/send-email-on-admin-edit
Feb 15, 2022
Merged
feat: send email on schedule edit by admin #140
akshay2000saxena
merged 7 commits into
staging
from
akshay/feat/send-email-on-admin-edit
Feb 15, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hanlinc27
requested changes
Feb 14, 2022
backend/typescript/services/implementations/schedulingService.ts
Outdated
Show resolved
Hide resolved
hanlinc27
approved these changes
Feb 15, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hanlinc27
pushed a commit
that referenced
this pull request
Feb 18, 2022
* Email template * refactor email tempalte * Update email * Add changes * Update email html
hanlinc27
pushed a commit
that referenced
this pull request
Feb 18, 2022
* Email template * refactor email tempalte * Update email * Add changes * Update email html
hanlinc27
added a commit
that referenced
this pull request
Mar 5, 2022
* Initial changes * chore(main): release v0.0.2 (#138) * style: misaligned cta button home page (#117) * fix: make all margins consistent across pages (#119) * fix: make all margins consistent across pages * fix: align footer * fix: lint and remove right margin Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: homepage and verification auth icons (#118) * add desktop icons * added verification images * fix close icon position * added email verification expiry * lint * revert app.tsx changes * add dashboardVariant * Update dashboard variant Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: change link to email header image (#121) * fix: view donations css fix (#124) * Disable text wrap and center items * update button alignment * other css fixes * fix: miscellaneous remaining bug bash fixes (#120) * fix: ui wording consistency * fix: thank you page copy * fix: date confirmation formatting * fix: start now button padding * chore: revert files * chore: switch order of user management and view donations * fix: lint * fix: style email to match figma (#122) * fix: style email to match figma * add additional comments and fix logo image link * fix: align columns at top * fix: lint * fix: add volunteer time * fix: reformat volunteer time * fix: custom function for date formatting * fix: update spacing * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * route to correct donation screen (#127) * feat: admin email verification donation scheduling (#123) * fix: style email to match figma * add: sendAdminEmailVerificationAfterDonationScheduled service * add additional comments and fix logo image link * fix: align columns at top * fix: lint for backend * fix: backend lint * fix again * style: admin email * fix: add volunteer time * fix: reformat volunteer time * style: consistent email formatting w donor emails * fix: custom function for date formatting * fix: update spacing * style: volunteer date bolded * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix linting issues * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * fix: add space * fix: add return * fix: lint * add: isAdmin parameter to sendEmailVerificationAfterSchedulingDonation and made appropriate changes * lint Co-authored-by: carissa-tang <69697180+carissa-tang@users.noreply.github.com> * fix: pass radio props to radio circle (#133) * fix: enable editing scheduled donations for admins (#132) * Enable editing for admins * Update ConfirmDetails.tsx * fix: replace url (#134) * test: set sameSite to None to fix auth refresh (#135) * change sameSite config to none * test change * test staging refresh * test change inequality * test refresh button * revert back to previous commit * add Bearer to accessToken refresh * style: edit calendar cards (#137) * fix: recurring donation id (#139) * recurring donation id integer and update fix * make explicit null check * check for NaN Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: fix recurring end date upon deletion (#130) * fix: preliminary changes to fix end recurring date * fix: add ability to change recurring end date * test: add tests and refactor into test utils * fix: linting tests * test: refactor tests into testUtils folder * fix: remove unnecessary code * feat: add donor feedback banner site wide (#144) * feat: send email on schedule edit by admin (#140) * Email template * refactor email tempalte * Update email * Add changes * Update email html * chore: revert to correct admin email * account page changes * fixes * Removed volunteer stuff * Removed error modal * rename component Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> Co-authored-by: Sharon He <xsharonhe@gmail.com>
hanlinc27
added a commit
that referenced
this pull request
Apr 3, 2022
* chore(main): release v0.0.2 (#138) * style: misaligned cta button home page (#117) * fix: make all margins consistent across pages (#119) * fix: make all margins consistent across pages * fix: align footer * fix: lint and remove right margin Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: homepage and verification auth icons (#118) * add desktop icons * added verification images * fix close icon position * added email verification expiry * lint * revert app.tsx changes * add dashboardVariant * Update dashboard variant Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: change link to email header image (#121) * fix: view donations css fix (#124) * Disable text wrap and center items * update button alignment * other css fixes * fix: miscellaneous remaining bug bash fixes (#120) * fix: ui wording consistency * fix: thank you page copy * fix: date confirmation formatting * fix: start now button padding * chore: revert files * chore: switch order of user management and view donations * fix: lint * fix: style email to match figma (#122) * fix: style email to match figma * add additional comments and fix logo image link * fix: align columns at top * fix: lint * fix: add volunteer time * fix: reformat volunteer time * fix: custom function for date formatting * fix: update spacing * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * route to correct donation screen (#127) * feat: admin email verification donation scheduling (#123) * fix: style email to match figma * add: sendAdminEmailVerificationAfterDonationScheduled service * add additional comments and fix logo image link * fix: align columns at top * fix: lint for backend * fix: backend lint * fix again * style: admin email * fix: add volunteer time * fix: reformat volunteer time * style: consistent email formatting w donor emails * fix: custom function for date formatting * fix: update spacing * style: volunteer date bolded * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix linting issues * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * fix: add space * fix: add return * fix: lint * add: isAdmin parameter to sendEmailVerificationAfterSchedulingDonation and made appropriate changes * lint Co-authored-by: carissa-tang <69697180+carissa-tang@users.noreply.github.com> * fix: pass radio props to radio circle (#133) * fix: enable editing scheduled donations for admins (#132) * Enable editing for admins * Update ConfirmDetails.tsx * fix: replace url (#134) * test: set sameSite to None to fix auth refresh (#135) * change sameSite config to none * test change * test staging refresh * test change inequality * test refresh button * revert back to previous commit * add Bearer to accessToken refresh * style: edit calendar cards (#137) * fix: recurring donation id (#139) * recurring donation id integer and update fix * make explicit null check * check for NaN Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: fix recurring end date upon deletion (#130) * fix: preliminary changes to fix end recurring date * fix: add ability to change recurring end date * test: add tests and refactor into test utils * fix: linting tests * test: refactor tests into testUtils folder * fix: remove unnecessary code * feat: add donor feedback banner site wide (#144) * feat: send email on schedule edit by admin (#140) * Email template * refactor email tempalte * Update email * Add changes * Update email html * chore: revert to correct admin email * feat: Update Volunteer Model with Pending/Approved ENUM (#128) * feat: add pending/approved enum * feat: update volunteer tests to include status * fix: cleanup unnecessary imports * feat: add updateVolunteerById and updateVolunteerByUserId to routes and services * fix: lint * test: add passing test * fix: correction to validator types and enum values * fix: remove userId from validator * feat: working id and userid * lint: fix linting errors * test: refactor tests * feat: add get volunteer by user id * fix: change casing * fix: addressing feedback * fix: add forgotten file * fix: addressing carissas comments Co-authored-by: xsharonhe <xsharonhe@gmail.com> * feat: volunteer api client (#143) * feat: add VolunteerAPIClient * fix: move status enum to volunteer file * fix: move status to avoid dependency cycle * fix: remove mistake * feat: Update Volunteer Model with Pending/Approved ENUM (#128) * feat: add pending/approved enum * feat: update volunteer tests to include status * fix: cleanup unnecessary imports * feat: add updateVolunteerById and updateVolunteerByUserId to routes and services * fix: lint * test: add passing test * fix: correction to validator types and enum values * fix: remove userId from validator * feat: working id and userid * lint: fix linting errors * test: refactor tests * feat: add get volunteer by user id * fix: change casing * fix: addressing feedback * fix: add forgotten file * fix: addressing carissas comments Co-authored-by: xsharonhe <xsharonhe@gmail.com> * fix: address Sharon's comment * fix: address union types Co-authored-by: xsharonhe <xsharonhe@gmail.com> * feat: check-ins table (#148) * add checkin table model * fix: add foreign key * feat: add volunteer_id as a foreign key and new scheduling volunteer services (#129) * Add volunteer_id as FK, update endpoints and tests Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: Add pending page for volunteers (#149) * feat: add new pending page for volunteers * fix: remove duplicate route * fix: close menu bar on click for mobile * fix: add back button that redirects to home * fix: rename function * feat: new pickUp scheduling endpoint (#147) - add new pickUp scheduling endpoint - updated routes, services, apiclient Co-authored-by: Dora Su <dora@Doras-MBP.ht.home> Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * fix: user experience changes for client (#152) * fix: remove 2 week block on scheduling calendar * fix: remove danger zone and allow admin to access landing * fix: remove 2 week limit in donor dashboard * feat: update recurring schedules (#136) * initial commit: abstract DeleteRecurringDonationModal to ModifyRecurringDonationModal * fix: delete import * add modals for editting recurring donation sections * fix: lint * add code so saving one time donation still works through modal fix * backend logic for editing recurring donations (pls no bugs) * start from current date * add toasts after successful save * fix edit recurring BE + FE, add error states * fix bugs and update volunteer screen values properly * fix: only pass edited field when updating * fix email wording * remove update email * pr fixes Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * bug fixes (#156) * fix: remove "next dropoff date" section in donation details (#157) * bug fixes * remove next dropoff date * remove unused deps * fix: only show upcoming donations in donor dashboard (#159) (#160) * only show upcoming donations in donor dashboard * fix tests * Initial changes * Combined donors and volunteers in table * Delete unnecessary yarn.lock file * added filter and approve fn * Removed console.log * removed console.log * review changes * Trying to fix stuff * fix update volunteer response * reorder deletion process Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> Co-authored-by: Sharon He <xsharonhe@gmail.com> Co-authored-by: Dora Su <dorasu.ca@gmail.com> Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Dora Su <dora@Doras-MBP.ht.home>
Shehryar21
added a commit
that referenced
this pull request
Apr 25, 2022
* style: misaligned cta button home page (#117) * fix: make all margins consistent across pages (#119) * fix: make all margins consistent across pages * fix: align footer * fix: lint and remove right margin Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: homepage and verification auth icons (#118) * add desktop icons * added verification images * fix close icon position * added email verification expiry * lint * revert app.tsx changes * add dashboardVariant * Update dashboard variant Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: change link to email header image (#121) * fix: view donations css fix (#124) * Disable text wrap and center items * update button alignment * other css fixes * fix: miscellaneous remaining bug bash fixes (#120) * fix: ui wording consistency * fix: thank you page copy * fix: date confirmation formatting * fix: start now button padding * chore: revert files * chore: switch order of user management and view donations * fix: lint * fix: style email to match figma (#122) * fix: style email to match figma * add additional comments and fix logo image link * fix: align columns at top * fix: lint * fix: add volunteer time * fix: reformat volunteer time * fix: custom function for date formatting * fix: update spacing * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * route to correct donation screen (#127) * feat: admin email verification donation scheduling (#123) * fix: style email to match figma * add: sendAdminEmailVerificationAfterDonationScheduled service * add additional comments and fix logo image link * fix: align columns at top * fix: lint for backend * fix: backend lint * fix again * style: admin email * fix: add volunteer time * fix: reformat volunteer time * style: consistent email formatting w donor emails * fix: custom function for date formatting * fix: update spacing * style: volunteer date bolded * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix linting issues * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * fix: add space * fix: add return * fix: lint * add: isAdmin parameter to sendEmailVerificationAfterSchedulingDonation and made appropriate changes * lint Co-authored-by: carissa-tang <69697180+carissa-tang@users.noreply.github.com> * fix: pass radio props to radio circle (#133) * fix: enable editing scheduled donations for admins (#132) * Enable editing for admins * Update ConfirmDetails.tsx * fix: replace url (#134) * test: set sameSite to None to fix auth refresh (#135) * change sameSite config to none * test change * test staging refresh * test change inequality * test refresh button * revert back to previous commit * add Bearer to accessToken refresh * style: edit calendar cards (#137) * fix: recurring donation id (#139) * recurring donation id integer and update fix * make explicit null check * check for NaN * feat: fix recurring end date upon deletion (#130) * fix: preliminary changes to fix end recurring date * fix: add ability to change recurring end date * test: add tests and refactor into test utils * fix: linting tests * test: refactor tests into testUtils folder * fix: remove unnecessary code * feat: create forget password frontend and backend workflow (#141) * feat: create forget password frontend and backend workflow * fix: revert branch state and cleanup * chore: lint reset password * fix: pr comments * feat: send email on schedule edit by admin (#140) * Email template * refactor email tempalte * Update email * Add changes * Update email html * feat: Update Volunteer Model with Pending/Approved ENUM (#128) * feat: add pending/approved enum * feat: update volunteer tests to include status * fix: cleanup unnecessary imports * feat: add updateVolunteerById and updateVolunteerByUserId to routes and services * fix: lint * test: add passing test * fix: correction to validator types and enum values * fix: remove userId from validator * feat: working id and userid * lint: fix linting errors * test: refactor tests * feat: add get volunteer by user id * fix: change casing * fix: addressing feedback * fix: add forgotten file * fix: addressing carissas comments Co-authored-by: xsharonhe <xsharonhe@gmail.com> * feat: volunteer api client (#143) * feat: add VolunteerAPIClient * fix: move status enum to volunteer file * fix: move status to avoid dependency cycle * fix: remove mistake * feat: Update Volunteer Model with Pending/Approved ENUM (#128) * feat: add pending/approved enum * feat: update volunteer tests to include status * fix: cleanup unnecessary imports * feat: add updateVolunteerById and updateVolunteerByUserId to routes and services * fix: lint * test: add passing test * fix: correction to validator types and enum values * fix: remove userId from validator * feat: working id and userid * lint: fix linting errors * test: refactor tests * feat: add get volunteer by user id * fix: change casing * fix: addressing feedback * fix: add forgotten file * fix: addressing carissas comments Co-authored-by: xsharonhe <xsharonhe@gmail.com> * fix: address Sharon's comment * fix: address union types Co-authored-by: xsharonhe <xsharonhe@gmail.com> * feat: add donor feedback banner site wide (#144) * feat: check-ins table (#148) * add checkin table model * fix: add foreign key * feat: add volunteer_id as a foreign key and new scheduling volunteer services (#129) * Add volunteer_id as FK, update endpoints and tests Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: Add pending page for volunteers (#149) * feat: add new pending page for volunteers * fix: remove duplicate route * fix: close menu bar on click for mobile * fix: add back button that redirects to home * fix: rename function * chore: remove unused moment deps (#151) * chore: remove backend oauth references * chore: extract and remove moment deps * feat: new pickUp scheduling endpoint (#147) - add new pickUp scheduling endpoint - updated routes, services, apiclient Co-authored-by: Dora Su <dora@Doras-MBP.ht.home> Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * fix: user experience changes for client (#152) * fix: remove 2 week block on scheduling calendar * fix: remove danger zone and allow admin to access landing * fix: remove 2 week limit in donor dashboard * feat: update recurring schedules (#136) * initial commit: abstract DeleteRecurringDonationModal to ModifyRecurringDonationModal * fix: delete import * add modals for editting recurring donation sections * fix: lint * add code so saving one time donation still works through modal fix * backend logic for editing recurring donations (pls no bugs) * start from current date * add toasts after successful save * fix edit recurring BE + FE, add error states * fix bugs and update volunteer screen values properly * fix: only pass edited field when updating * fix email wording * remove update email * pr fixes Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * bug fixes (#156) * fix: remove "next dropoff date" section in donation details (#157) * bug fixes * remove next dropoff date * remove unused deps * fix: only show upcoming donations in donor dashboard (#159) * only show upcoming donations in donor dashboard * fix tests * feat: Disable save button before editing (#125) * Initial changes * chore(main): release v0.0.2 (#138) * style: misaligned cta button home page (#117) * fix: make all margins consistent across pages (#119) * fix: make all margins consistent across pages * fix: align footer * fix: lint and remove right margin Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: homepage and verification auth icons (#118) * add desktop icons * added verification images * fix close icon position * added email verification expiry * lint * revert app.tsx changes * add dashboardVariant * Update dashboard variant Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: change link to email header image (#121) * fix: view donations css fix (#124) * Disable text wrap and center items * update button alignment * other css fixes * fix: miscellaneous remaining bug bash fixes (#120) * fix: ui wording consistency * fix: thank you page copy * fix: date confirmation formatting * fix: start now button padding * chore: revert files * chore: switch order of user management and view donations * fix: lint * fix: style email to match figma (#122) * fix: style email to match figma * add additional comments and fix logo image link * fix: align columns at top * fix: lint * fix: add volunteer time * fix: reformat volunteer time * fix: custom function for date formatting * fix: update spacing * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * route to correct donation screen (#127) * feat: admin email verification donation scheduling (#123) * fix: style email to match figma * add: sendAdminEmailVerificationAfterDonationScheduled service * add additional comments and fix logo image link * fix: align columns at top * fix: lint for backend * fix: backend lint * fix again * style: admin email * fix: add volunteer time * fix: reformat volunteer time * style: consistent email formatting w donor emails * fix: custom function for date formatting * fix: update spacing * style: volunteer date bolded * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix linting issues * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * fix: add space * fix: add return * fix: lint * add: isAdmin parameter to sendEmailVerificationAfterSchedulingDonation and made appropriate changes * lint Co-authored-by: carissa-tang <69697180+carissa-tang@users.noreply.github.com> * fix: pass radio props to radio circle (#133) * fix: enable editing scheduled donations for admins (#132) * Enable editing for admins * Update ConfirmDetails.tsx * fix: replace url (#134) * test: set sameSite to None to fix auth refresh (#135) * change sameSite config to none * test change * test staging refresh * test change inequality * test refresh button * revert back to previous commit * add Bearer to accessToken refresh * style: edit calendar cards (#137) * fix: recurring donation id (#139) * recurring donation id integer and update fix * make explicit null check * check for NaN Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: fix recurring end date upon deletion (#130) * fix: preliminary changes to fix end recurring date * fix: add ability to change recurring end date * test: add tests and refactor into test utils * fix: linting tests * test: refactor tests into testUtils folder * fix: remove unnecessary code * feat: add donor feedback banner site wide (#144) * feat: send email on schedule edit by admin (#140) * Email template * refactor email tempalte * Update email * Add changes * Update email html * chore: revert to correct admin email * account page changes * fixes * Removed volunteer stuff * Removed error modal * rename component Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> Co-authored-by: Sharon He <xsharonhe@gmail.com> * feat: Add volunteer to sign up flow (#150) * feat: add radio buttons for account type * feat: update sign up flow to include account type and terms and conditions * fix: update navigation to be role dependent * fix: ui changes to match figma designs * fix: make changes requested * fix: lint * feat: content backend model, route, validators, services and tests (#161) * feat: add content service backend endpoints fix: stash pop feat: add content service validators and route * feat: add content API Clients * test: add content service tests * fix: pr comments * feat: get and delete checkin endpoints (#155) * Create required files * Create test file * feat: create basic structure for files * fix type * feat: get endpoints * fix: linting changes * test: working get tests * add: checkin delete service tests * fix: check start date/end date are valid * fix: send proper json responses... * fix: remove unecessary email service * fix: failed tests fix * fix: checkin delete check * fix: console log * fix: error messages and start date < end date * fix: use dayjs for comparing start/end dates * fix: use dayjs for dates Co-authored-by: Dora Su <dora@Doras-MBP.ht.home> Co-authored-by: xsharonhe <xsharonhe@gmail.com> * feat: create and update check in endpoints (#153) * Create required files * Create test file * Create check in router and types * Create check in validators * Implement create and update check in * Write tests + lint * Add validators for all fields * adds general validator, uses dayjs with date manipulation * updates checkin tests * wip: date objects are disgusting * fix dates * removes unecessary comment Co-authored-by: Dora Su <dora@Doras-MBP.ht.home> Co-authored-by: Dora Su <dora@v1040-wn-rt-a-0-208.campus-dynamic.uwaterloo.ca> Co-authored-by: Linna Luo <linnaluo18@gmail.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: send donation cancellation email (#126) * add code for donor deleting one-time donation * add code for sending cancellation email when donor deletes a recurring donation * fix: find schedule with exact start time fix: tests pass * replace admin email with communityfridgekw@gmail.com * fix: replace numbers with booleans * fixes how role parameter is passed to delete schedules endpoint * fixes merge conflicts * fixes endpoint to properly take role value * replaces temp admin email with community fridge kw email, move cancellation email to utlilities * feat: frontend CheckInAPIClient (#164) * add: checkin types and checkin api client - get, delete * add: api client - post, put * add: checkin types and checkin api client - get, delete * add: api client - post, put * fix: error for getallcheckins * nit: update function names, checkin type optional parameters * chore(deps): update node-fetch to 2.6.7 * fix: only use cfkw admin email in production environment (#168) * build(deps): bump glob-parent from 5.1.1 to 5.1.2 in /backend/typescript (#170) Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/gulpjs/glob-parent/releases) - [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md) - [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2) --- updated-dependencies: - dependency-name: glob-parent dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump tar from 6.1.0 to 6.1.11 in /frontend (#171) Bumps [tar](https://github.com/npm/node-tar) from 6.1.0 to 6.1.11. - [Release notes](https://github.com/npm/node-tar/releases) - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-tar/compare/v6.1.0...v6.1.11) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump follow-redirects from 1.14.0 to 1.14.9 in /frontend (#169) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.0 to 1.14.9. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.0...v1.14.9) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump url-parse from 1.5.1 to 1.5.10 in /frontend (#172) Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: volunteer pending email after verification (#163) * feat: update sign up flow to include account type and terms and conditions * fix: update navigation to be role dependent * fix: ui changes to match figma designs * fix: make changes requested * feat: add services for pending status email * fix: spelling errors * fix: triple equality sign * fix: add await to email function call * feat: add admin contact * fix: update wording for error message Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: hardcode email Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * chore: add eslint rule to remove unused imports (#173) * feat: create volunteer context (#166) * feat: create volunteer context * fix: lint * fix: linit context * feat: context dispatcher * lint * fix: remove null type * feat: add to local storage * lint * chore: fix linting errors * fix: update naming Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * refactor: migrate to dayjs for create scheduling (#165) * migrate to dayjs for create scheduling * fix create scheduling tests * feat: Update my account page for volunteers (#162) Update my account page for volunteers * feat: send 24 hour email reminder for schedule (#142) * Send 24 hour email reminder * delete email utils * update image url * add staging env for email testing (will revert later) Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * fix: update seeding script with donors, volunteers, checkin, content (#174) * chore: update seeding script fix: emails * chore: update readme with new seeding credentials * fix: cascade drop tables * fix seeding Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * fix: copy changes to frontend (#175) * refactor to change everything to sentence case in frontend * remove brackets Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix spacing Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: add new nav dropdown for admin view (#167) * feat: add new nav dropdown for admin view * fix: match styling to figma * fix: make entire menu clickable, not only as a link * fix: remove unused import * nit: remove space * fix: add redirecting to homepage on logout * feat: make admin routes restricted by role * fix: hover color persists after tab click * fix: update wording * fix: use sentence casing * fix: use sentence casing again * chore(build): staging and docker environment fixes (#180) * fix: docker node image version * fix: wrap cronservice in try catch for checking reminders * chore(build): fix yarn lockfile on backend * feat: volunteer shift tabs for food rescue and checkin sign up (#181) * add: inital volunteer shift tabs skeleton * fix: styling * add: useStep * lint * remove cards * style: volunteer shift tab colour * ref: remove duplicate code * ref: remove unnecessary div Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: comment out checkReminders * feat(ui): donation information card refresh (#185) * feat: donor dashboard card refresh * ref: replace admin and public calendar card with reusable dropoff card * fix: minor card styling * style: fix card width * fix: mouse click * fix: pr comments * fix: make entire social media link clickable (#188) * fix: recurring donation dates (#186) * fix recurring donation dates * use date-fns to set EOD time * feat: Create a backend service to call all checkins and food rescues associated with a volunteer (#183) * feat: working checkin and scheduling sorting function * feat: working tests and backend endpoint * fix: lint backend * fix: addressing feedback * fix: lint * fix: revert test utils * fix: address changes * feat: Delete User Backend Changes (#184) * update delete user function * separate delete logic * fix lint * pr comments and add await Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: admin view check-in page (#187) * Implement heading, description, and buttons * Implement check-in cards * Allow volunteerId to be null, create Partial for updateCheckIn * Style drop down menu, add delete functionality * Format code with linter * ref: revert backend volunteerId changes * ref: remove non chakra icons * ref: clean up checkin info card * feat: move to use same calendar component * ref: remove duplicate render calendar * ref: remove duplicate calendar * ref: add conditional content description * chore: lint backend * test: fix volunteerid in backend test * test: update checkInService.ts * Address PR requested changes * Fix imports and exports * Rename file to fix firebase error Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: Add volunteers to user management table (#178) * chore(main): release v0.0.2 (#138) * style: misaligned cta button home page (#117) * fix: make all margins consistent across pages (#119) * fix: make all margins consistent across pages * fix: align footer * fix: lint and remove right margin Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: homepage and verification auth icons (#118) * add desktop icons * added verification images * fix close icon position * added email verification expiry * lint * revert app.tsx changes * add dashboardVariant * Update dashboard variant Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: change link to email header image (#121) * fix: view donations css fix (#124) * Disable text wrap and center items * update button alignment * other css fixes * fix: miscellaneous remaining bug bash fixes (#120) * fix: ui wording consistency * fix: thank you page copy * fix: date confirmation formatting * fix: start now button padding * chore: revert files * chore: switch order of user management and view donations * fix: lint * fix: style email to match figma (#122) * fix: style email to match figma * add additional comments and fix logo image link * fix: align columns at top * fix: lint * fix: add volunteer time * fix: reformat volunteer time * fix: custom function for date formatting * fix: update spacing * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * route to correct donation screen (#127) * feat: admin email verification donation scheduling (#123) * fix: style email to match figma * add: sendAdminEmailVerificationAfterDonationScheduled service * add additional comments and fix logo image link * fix: align columns at top * fix: lint for backend * fix: backend lint * fix again * style: admin email * fix: add volunteer time * fix: reformat volunteer time * style: consistent email formatting w donor emails * fix: custom function for date formatting * fix: update spacing * style: volunteer date bolded * fix: resize image for gmail * fix: linting * fix: use string literal instead of concatenating * fix linting issues * fix: remove space * fix: use dayjs instead of own function to format * fix: lint * fix: add space * fix: add return * fix: lint * add: isAdmin parameter to sendEmailVerificationAfterSchedulingDonation and made appropriate changes * lint Co-authored-by: carissa-tang <69697180+carissa-tang@users.noreply.github.com> * fix: pass radio props to radio circle (#133) * fix: enable editing scheduled donations for admins (#132) * Enable editing for admins * Update ConfirmDetails.tsx * fix: replace url (#134) * test: set sameSite to None to fix auth refresh (#135) * change sameSite config to none * test change * test staging refresh * test change inequality * test refresh button * revert back to previous commit * add Bearer to accessToken refresh * style: edit calendar cards (#137) * fix: recurring donation id (#139) * recurring donation id integer and update fix * make explicit null check * check for NaN Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: fix recurring end date upon deletion (#130) * fix: preliminary changes to fix end recurring date * fix: add ability to change recurring end date * test: add tests and refactor into test utils * fix: linting tests * test: refactor tests into testUtils folder * fix: remove unnecessary code * feat: add donor feedback banner site wide (#144) * feat: send email on schedule edit by admin (#140) * Email template * refactor email tempalte * Update email * Add changes * Update email html * chore: revert to correct admin email * feat: Update Volunteer Model with Pending/Approved ENUM (#128) * feat: add pending/approved enum * feat: update volunteer tests to include status * fix: cleanup unnecessary imports * feat: add updateVolunteerById and updateVolunteerByUserId to routes and services * fix: lint * test: add passing test * fix: correction to validator types and enum values * fix: remove userId from validator * feat: working id and userid * lint: fix linting errors * test: refactor tests * feat: add get volunteer by user id * fix: change casing * fix: addressing feedback * fix: add forgotten file * fix: addressing carissas comments Co-authored-by: xsharonhe <xsharonhe@gmail.com> * feat: volunteer api client (#143) * feat: add VolunteerAPIClient * fix: move status enum to volunteer file * fix: move status to avoid dependency cycle * fix: remove mistake * feat: Update Volunteer Model with Pending/Approved ENUM (#128) * feat: add pending/approved enum * feat: update volunteer tests to include status * fix: cleanup unnecessary imports * feat: add updateVolunteerById and updateVolunteerByUserId to routes and services * fix: lint * test: add passing test * fix: correction to validator types and enum values * fix: remove userId from validator * feat: working id and userid * lint: fix linting errors * test: refactor tests * feat: add get volunteer by user id * fix: change casing * fix: addressing feedback * fix: add forgotten file * fix: addressing carissas comments Co-authored-by: xsharonhe <xsharonhe@gmail.com> * fix: address Sharon's comment * fix: address union types Co-authored-by: xsharonhe <xsharonhe@gmail.com> * feat: check-ins table (#148) * add checkin table model * fix: add foreign key * feat: add volunteer_id as a foreign key and new scheduling volunteer services (#129) * Add volunteer_id as FK, update endpoints and tests Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: Add pending page for volunteers (#149) * feat: add new pending page for volunteers * fix: remove duplicate route * fix: close menu bar on click for mobile * fix: add back button that redirects to home * fix: rename function * feat: new pickUp scheduling endpoint (#147) - add new pickUp scheduling endpoint - updated routes, services, apiclient Co-authored-by: Dora Su <dora@Doras-MBP.ht.home> Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * fix: user experience changes for client (#152) * fix: remove 2 week block on scheduling calendar * fix: remove danger zone and allow admin to access landing * fix: remove 2 week limit in donor dashboard * feat: update recurring schedules (#136) * initial commit: abstract DeleteRecurringDonationModal to ModifyRecurringDonationModal * fix: delete import * add modals for editting recurring donation sections * fix: lint * add code so saving one time donation still works through modal fix * backend logic for editing recurring donations (pls no bugs) * start from current date * add toasts after successful save * fix edit recurring BE + FE, add error states * fix bugs and update volunteer screen values properly * fix: only pass edited field when updating * fix email wording * remove update email * pr fixes Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * bug fixes (#156) * fix: remove "next dropoff date" section in donation details (#157) * bug fixes * remove next dropoff date * remove unused deps * fix: only show upcoming donations in donor dashboard (#159) (#160) * only show upcoming donations in donor dashboard * fix tests * Initial changes * Combined donors and volunteers in table * Delete unnecessary yarn.lock file * added filter and approve fn * Removed console.log * removed console.log * review changes * Trying to fix stuff * fix update volunteer response * reorder deletion process Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> Co-authored-by: Sharon He <xsharonhe@gmail.com> Co-authored-by: Dora Su <dorasu.ca@gmail.com> Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Dora Su <dora@Doras-MBP.ht.home> * feat: volunteer dashboard page (#179) * feat: new volunteer dashboard * fix: add new shifts apge * fix: rename page * fix: add new page * feat: components for varying shift types * refactor: remove duplicate code * fix: add new cardfield component * feat: new volunteer dashboard * fix: add new shifts apge * fix: rename page * fix: add new page * feat: components for varying shift types * refactor: remove duplicate code * fix: add new cardfield component * chore: rebase and lint * fix: update shit type enum to match backend * fix: call getCheckInsAndSchedules endpoint for sorted shifts * fix: format times * fix: fix header casing * fix: remove space in time * fix: change text to match design * fix: remove routing * fix: use volunteer context * fix: use card component * fix: remove duplicate import * fix: add missing closing bracket * fix: update mobile styling to match figma Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: auto logout user when session expires (#192) * ref: extract out return to login modal * feat: auto logout when token expires * fix: handle delete for checkin at top level of component (#195) * fix: redirect admin to checkins by default * feat: add deleteCheckIn function as prop * refactor: extract email header and footer (#194) * extract header and footer add socials * chore: lint backend Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * Made all phone num mandatory (#198) * feat: admin create checkin page (#176) * initial commit: page framework * adds logic for date range selection * wip: adds modified date range selector * fix: ui changes to calendar input * chore: yarn fix * wip: form requires extra date selection on date range picker to be updated correctly * chore: adds error message file, linting * chore: refactor with date-fns, fix resetting of error state chore: remove unused error message * fix: fix error state logic * fix: creates checkins from start date to end date correctly * fix: adds error state for date range picker * fix: checks for empty endDate * chore: refactor chore: removes unecessary comments * chore: route create button to create checkin page, remove unecessary comments * chore: edits checkInDefaultData object * removed useForm and refactored date logic * add admin to route * pr comments * change checkin admin buttons position for mobile Co-authored-by: carissa-tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: Added admin donation filter buttons (#196) * Added admin donation filter * feat: admin delete range of checkins (#197) * wip: initial commit * feat: add form components * feat: add error messages * wip: initial commit * feat: add form components * feat: add error messages * fix: increment enddate so range is inclusive * fix: refactor without useForm * fix: refactor code for error messages * feat: add route to delete button * feat: add delete modal * chore: lint frontend * fix: add route to mobile * Update frontend/src/components/pages/FridgeManagement/FridgeCheckIns/DeleteShiftModal.tsx Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * Update frontend/src/components/pages/FridgeManagement/FridgeCheckIns/DeleteShiftModal.tsx Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * Update frontend/src/components/pages/FridgeManagement/FridgeCheckIns/DeleteShiftModal.tsx Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: fix modal sizing * fix: refactor modal code * fix: change wording * fix: make start date start of day Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: edit content pages (#191) * Implement edit content pages + routes * Add redirection to edit pages from view pages * Add close and save button redirect * Fix formatting * Update mobile styling * Add form validation for empty input * Refactor edit content form * Fix formatting * fix: invalid empty content * fix: remove optional content Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: Add error handling for loading users for admin (#201) * added error handling message * feat: send admin email on volunteer sign up (#200) * adds sendAdminVolunteerSignUpEmail and calls it after volunteer is created * fix: updates email title Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> fix: removes unnecessary portion of email Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> chore: removes unused code * fix: volunteer and admin default routing and add protections (#204) * fix: volunteer and admin default routing and add protections * fix: pr comment 1 * fix: checkin deletion backend unhandled promise error (#199) * fix: checkin delete header setting * fix: backend error * fix: use getAdminEmail() (#205) * use getAdminEmail * change non prod admin email * feat: admin edit checkins page (#202) * feat: initial commit * fix: rename route * fix: separate type for updatecheckinfields * fix: add error validation for equal start and end time * fix: add error message for same start and end time * fix: fix toast logic * fix: restore code * fix: update return type of updateCheckInById to false on error * Update frontend/src/components/pages/FridgeManagement/FridgeCheckIns/EditCheckin.tsx Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: address comments Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: Add confirmation modal when deleting a user (#206) * Added modal for delete user * feat: admin export food rescues and checkins (#203) * initial csv export functions * add export functions * use DownloadCSV function * remove react-csv from dependencies * remove package lock * update yarn lock * format dates * fix: formatting date Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: Add confirmation modal when deleting checkin + removing volunteer (#207) * Add modal * fix: 24 hour date validation (#208) * build(deps): bump minimist from 1.2.5 to 1.2.6 in /backend/typescript (#209) * build(deps): bump async from 3.2.0 to 3.2.3 in /backend/typescript (#210) Bumps [async](https://github.com/caolan/async) from 3.2.0 to 3.2.3. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v3.2.0...v3.2.3) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump axios from 0.21.1 to 0.21.2 in /frontend (#211) Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump minimist from 1.2.5 to 1.2.6 in /frontend (#214) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: food rescue volunteer sign up flow (#189) * add food rescue cards * fix: donor view of donation details * fix: confirm details donor view * add: carissa's shift component * temp commit * add: first 2 steps food rescue signup * add: checkins api call * add: checkin flow * fix: show donor data * fix: foreign key and start calendar * fix: add eslint error fiix * add: shift card to checkin calendar view * merge * fix: dividers for food rescue cards * feat: add divider between calendar items * fix: button width * style: volunteer shift container * fix: only show time after and async calls * refactor: remove redundant data * fix: get updates for checkin * ref: setting shift details callback * ref: remove duplicate api call * fix: dashboard routing * ref: extract calendar toggles * chore: remove stray logs * ref: clean up * use one callback function and more refactoring * confirm details refactoring * confirm details refactoring * view details integration * feat: add cancel volunteer shift button * feat: add back button * fix: render * fix volunteerId bug and add description/link * add volunteerOnly access to volunteer dashboard * fix: only allow admin to edit content * fix: desc * fix: date format * only show upcoming shifts * fix: shift label * fix tests Co-authored-by: xsharonhe <xsharonhe@gmail.com> Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> Co-authored-by: carissa-tang <69697180+carissa-tang@users.noreply.github.com> * build: Update prod CORS (#218) * add prod url in cors allow list * remove slash * feat: send email to volunteer when approved (#219) * feat: send email to volunteer when approved * chore: yarn fix * feat: three questions to volunteer signup flow (#217) * feat: add three questions to volunteer questions * fix: lint * feat: add emails and lint * chore: remove console log statement * fix: remove redundant code * fix: trim whitespace Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: volunteer food rescue/check-in shift signup confirmation email (#216) * adds confirmation emails for food rescue and check-in shifts for volunteers * ref: volunteer checkin sign up * fix: food rescue email * feat: add admin checkin email * fix: food rescue admin * chore: eslint disable * test: fix test * use dayjs timezone conversion Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> * feat: send email to volunteer and admin when volunteer cancels checkin (#220) * feat: send food rescue cancellation emails to admin and volunteer (#221) * send email upon food rescue cancellation * fix: email reminders (#190) * add email route logic * small date change * revert axios additions * add volunteerService to CronService * add volunteer email reminders * add admin reminder emails * add null assertion check * trigger deploy * add volunteerId checks * feat: add health endpoint (#222) * add health endpoint * update comment * style: admin fridge checkin and scheduled donation design fixes (#226) * fixed icons (#224) * style: admin user management (#225) * feat: add three questions to volunteer questions * fix: lint * feat: add emails and lint * chore: remove console log statement * fix: remove redundant code * style: ui changes to user management * fix: copy on delete user toast Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * style: create account flow / login / change password (#227) * Restyle create account flow * Restyle signup + volunteer verification/pending * Fix spacing for login error + fix styling for change password * Reword login * fix: reuse backbutton component Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * style: volunteer dashboard/signup flow fixes (#229) * Revert "feat: send food rescue cancellation emails to admin and volunteer (#221)" This reverts commit 550b4802806d967143cd9b1b2d58928be62c4a18. * fix: volunteer dashboard/signup / tiny donor dashboard fixes * chore: lint backend * fix: revert ISchedulingService change Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * style: misc. frontend fixes (#232) * frontend fixes * remove hardcode text size for email footer * chore: lint backend Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * style: homepage style fixes (#228) * Revert "feat: send food rescue cancellation emails to admin and volunteer (#221)" This reverts commit 550b4802806d967143cd9b1b2d58928be62c4a18. * fix: initial commit * fix: update branch w/ new changes * fix: change calendar toggle ui * fix: update calendar heading * fix: revert backend changes * fix: update routing * fix: fix header spacing * fix: wording * fix: add pending page to volunteer scheduling flow * fix: show pending for all non-approved volunteers * fix: add error message for invalid access by role * fix: refactor code for button clicks * chore: yarn fix * fix: wrap text for mobile view * fix: spacing * feat: add routing toast Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * fix: remove volunteerId when donor edits donation to not need volunteer (#233) * feat: email volunteer after admin deletes schedule (#212) * add: email volunteer after admin deletes schedule * fix: set volunteerId to null when volunteering as admin (#234) * fix page scrolling (#235) * feat: emails when admin removes volunteer or delete checkin (#230) * add admin remove volunteer from checkin email * add volunteer email when checkin deleted by admin * send volunteer email when admin deletes checkin by range * change email link * use CancellationEmail util func * Edited email Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> * fix: update CFKW logo (#241) * fix: button UI changes (#240) * fix: button ui for donors * fix: button ui volunteer views * build(deps): bump async from 2.6.3 to 2.6.4 in /frontend (#238) Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: csv export changes (#244) * Modify order of headers * Remove all false fields * Run linter * fix: requested client copy changes (#237) * fix: requested changes * fix: wording * fix: add return * fix: remove general error modal * fix: lint * fix: show checkin end time for volunteer details (#236) * fix: show checkin end time for volunteer details * fix: pr comment * fix: misc styling changes (#243) * adds fixes except underline for link to instructions on admin view * fix: add more changes * fix: add mobile padding on content description * style: adjust padding Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: add empty state to calendar (#231) * feat: add empty state to calendar * fix: add missing bracket * fix: lint * fix: update design for empty state * chore: lint * fix: remove return * fix: refactor logic for handling empty checkins * chore: lint * fix: refactor code * fix: more refactoring * fix: move types to top level * fix: padding * fix: margin spacing * fix: update pic for verification email * chore: lint * fix: add new image * fix: update pic * fix: refactor code * fix: wording of empty state Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: xsharonhe <xsharonhe@gmail.com> * fix: show checkin end time for volunteer details (#236) * fix: show checkin end time for volunteer details * fix: pr comment * fix: misc styling changes (#243) * adds fixes except underline for link to instructions on admin view * fix: add more changes * fix: add mobile padding on content description * style: adjust padding Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> * feat: add empty state to calendar (#231) * feat: add empty state to calendar * fix: add missing bracket * fix: lint * fix: update design for empty state * chore: lint * fix: remove return * fix: refactor logic for handling empty checkins * chore: lint * fix: refactor code * fix: more refactoring * fix: move types to top level * fix: padding * fix: margin spacing * fix: update pic for verification email * chore: lint * fix: add new image * fix: update pic * fix: refactor code * fix: wording of empty state Co-authored-by: Hanlin Cheng <h62cheng@uwaterloo.ca> Co-authored-by: xsharonhe <xsharonhe@gmail.com> * fix: add color for today in custom css sheet (#247) * fix: add color for today in custom css sheet (#247) * manually remove unnecessary additions * fix: only have screening details for volunteers (#248) Co-authored-by: Akshay Saxena <41586370+akshay2000saxena@users.noreply.github.com> Co-authored-by: Carissa Tang <69697180+carissa-tang@users.noreply.github.com> Co-authored-by: Jessie Peng <jessie.peng2010@gmail.com> Co-authored-by: Linna <38363056+linnall@users.noreply.github.com> Co-authored-by: Shehryar Suleman <shehryarsuleman@gmail.com> Co-authored-by: Sharon He <xsharonhe@gmail.com> Co-authored-by: Dora Su <dorasu.ca@gmail.com> Co-authored-by: Dora Su <dora@Doras-MBP.lan> Co-authored-by: Amanda Misjuwar <amandabmisjuwar@gmail.com> Co-authored-by: Dora Su <dora@Doras-MBP.ht.home> Co-authored-by: Amanda Misjuwar <37950626+AmandaMisjuwar@users.noreply.github.com> Co-authored-by: Dora Su <dora@v1040-wn-rt-a-0-208.campus-dynamic.uwaterloo.ca> Co-authored-by: Linna Luo <linnaluo18@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amy Li <amyli16016@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Brief description. What is this change?
Send Donor a email when admin edits schedule
Implementation description. How did you make this change?
Steps to test
Checklist