Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added complete and cancel buttons to PickupEvent Edit Page #210

Merged
merged 7 commits into from
Apr 1, 2024
Merged

Added complete and cancel buttons to PickupEvent Edit Page #210

merged 7 commits into from
Apr 1, 2024

Conversation

WishingWell13
Copy link
Contributor

@WishingWell13 WishingWell13 commented Mar 31, 2024 •
edited by SheepTester
Loading

Also fixed text wrap issue

Also updated Button component to take in class names

Info

Closes #203.

Implements the complete/fulfill and cancel functionality on the frontend for Pickup Events.

Changes

  • Added complete and cancel buttons to Pickup Event Edit Page and Home Page
  • Also fixed text wrap issue on admin event page
  • Also updated Button component to take in class names

Type of Change

  • Bug Fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as
    expected)
  • Logistics Change (A change to a README, description, or dev workflow setup like
    linting/formatting)
  • Continuous Integration Change (Related to deployment steps or continuous integration
    workflows)
  • Other: (Fill In)

Testing

I have tested that my changes fully resolve the linked issue ...

  • locally on Desktop.
  • on the live deployment preview on Desktop.
  • on the live deployment preview on Mobile.
  • I have added new Cypress tests that are passing.

Checklist

  • I have performed a self-review of my own code.
  • I have followed the style guidelines of this project.
  • I have documented any new functions in /src/lib/* and commented hard to understand areas
    anywhere else.
  • My changes produce no new warnings.

Screenshots

image image image

@WishingWell13
Added complete and cancel buttons to PickupEvent Edit Page
a67ebee 
Also fixed text wrap issue

Also updated Button component to take in class names
@vercel Vercel
Copy link

vercel bot commented Mar 31, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
membership-portal-ui-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 1, 2024 7:30am

@WishingWell13 WishingWell13 self-assigned this Mar 31, 2024
@WishingWell13 WishingWell13 marked this pull request as ready for review March 31, 2024 07:55
SheepTester
SheepTester approved these changes Mar 31, 2024
View reviewed changes
Copy link
Member

@SheepTester SheepTester left a comment

Choose a reason for hiding this comment

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

I think you should hide the complete/cancel buttons if the event isn't active

nitpicks aside, this looks good! 🦀🦀

src/components/admin/event/AdminPickupEvent/AdminPickupEventForm.tsx Outdated Show resolved Hide resolved
src/components/admin/event/AdminPickupEvent/style.module.scss Show resolved Hide resolved
src/components/admin/event/AdminPickupEvent/style.module.scss Outdated Show resolved Hide resolved
src/components/admin/store/PickupEventCard/index.tsx Outdated Show resolved Hide resolved
src/components/admin/store/PickupEventCard/index.tsx Outdated Show resolved Hide resolved
src/lib/api/EventAPI.ts Outdated Show resolved Hide resolved
@WishingWell13
Moved complete and edit buttons to single pickup event page
4844025 
Updated button styling for pickup event page

Updated common Button component styling to auto expand to content

Hide the complete/cancel buttons if the event isn't active
@WishingWell13
Merge branch 'main' into andy/completeCancelPickupEvents
c238b2b
SheepTester
SheepTester approved these changes Apr 1, 2024
View reviewed changes
Copy link
Member

@SheepTester SheepTester left a comment

Choose a reason for hiding this comment

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

yeah these changes look good

src/components/common/Button/style.module.scss Outdated Show resolved Hide resolved
@WishingWell13 WishingWell13 merged commit ba72d2e into main Apr 1, 2024
5 of 6 checks passed
@WishingWell13 WishingWell13 deleted the andy/completeCancelPickupEvents branch April 1, 2024 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SheepTester SheepTester SheepTester approved these changes

@farisashai farisashai Awaiting requested review from farisashai farisashai is a code owner

@raymosun raymosun Awaiting requested review from raymosun raymosun is a code owner

@trevorkw7 trevorkw7 Awaiting requested review from trevorkw7 trevorkw7 is a code owner

@alexzhang1618 alexzhang1618 Awaiting requested review from alexzhang1618 alexzhang1618 is a code owner

Assignees

@WishingWell13 WishingWell13

Labels
PR: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cancel / Complete pickup events
2 participants
@WishingWell13 @SheepTester