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

Cart Pickup Event Picker Changes #232

Merged
merged 20 commits into from
Apr 17, 2024
Merged

Cart Pickup Event Picker Changes #232

merged 20 commits into from
Apr 17, 2024

Conversation

WishingWell13
Copy link
Contributor

@WishingWell13 WishingWell13 commented Apr 16, 2024 •
edited
Loading

Info

Closes #230.

Changes

  • Removed the hover/outline thing, it has weird interaction with unlinked events
  • Hid pickup event from user on cart page if a pickup event is full
  • before, you had to wait for checkout to fail to see if a pickup event is full
  • Fixed styling for create pickup event button

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

Background Info

https://css-tricks.com/a-complete-guide-to-data-attributes/

@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
@WishingWell13
Added buttons to admin pickup home page
e173424
@WishingWell13
Merge branch 'main' into andy/completeCancelPickupEvents
899feed
@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
@WishingWell13
Removed unnecessary CSS
e1c433e
@WishingWell13
Merge branch 'andy/completeCancelPickupEvents' of https://github.com/…
11cee94 
…acmucsd/membership-portal-ui-v2 into andy/completeCancelPickupEvents
@WishingWell13
Merge branch 'main' into andy/completeCancelPickupEvents
c76771b
@WishingWell13
Fixed bug with linkedEventUuid not found edge case
ba8679e 
If you clicked the select a pickup event toggle but didn't select an event, the API call wouldn't work b/c the linkedEventUuid would be '', not null.

Fixed the issue by changing value to be null when linkedEventUuid is ''
@WishingWell13
Made admin pickup events sort by start date
242eabc
@WishingWell13
Removed console.log
bc7bfcd 
(For last commit)
https://stackoverflow.com/questions/54634515/typescript-sorting-object-by-date
@WishingWell13
Refactored code to eliminate creation of new variable
4eda486 
You have to specify the key name
like linkedEventUuid: linkedEventUuid || null
the shorthand only works if you pass in a single variable that’s used as the key and value like u did for title
@WishingWell13
Added checks to make weird dates not break code
c745347 
added a popup instead
@WishingWell13
Use instanceof instead of === for error check
266390e
@WishingWell13
Added function to parse props
7ea90e6 
for complete and cancel functions
@WishingWell13
Make full pickup events not show on cart page
ec1b24f
@WishingWell13
Styled create pickup event button
6ef1325
@WishingWell13
Made the border on the pickup event card in cart page not glow
13b65da 
https://css-tricks.com/a-complete-guide-to-data-attributes/
@vercel Vercel
Copy link

vercel bot commented Apr 16, 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 17, 2024 11:34pm
testing-membership-portal-ui-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 17, 2024 11:34pm

alexzhang1618
alexzhang1618 approved these changes Apr 17, 2024
View reviewed changes
Copy link
Contributor

@alexzhang1618 alexzhang1618 left a comment

Choose a reason for hiding this comment

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

Generally LGTM, just some nits

src/components/events/EventCard/index.tsx Outdated Show resolved Hide resolved
src/pages/store/cart.tsx Outdated Show resolved Hide resolved
@WishingWell13 WishingWell13 merged commit 0861556 into main Apr 17, 2024
8 checks passed
@WishingWell13 WishingWell13 deleted the andy/completeCancelPickupEvents branch April 17, 2024 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexzhang1618 alexzhang1618 alexzhang1618 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

@SheepTester SheepTester Awaiting requested review from SheepTester SheepTester 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.
2 participants
@WishingWell13 @alexzhang1618