Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Merch Store #73

Merged
merged 114 commits into from
Jul 29, 2024
Merged

Merch Store #73

merged 114 commits into from
Jul 29, 2024

Conversation

PenTest-duck
Copy link
Contributor

@PenTest-duck PenTest-duck commented Jun 15, 2024

TODO: Post merge testing and fixes before 2025

scorpiontornado and others added 26 commits June 22, 2024 03:05
* Rename old merch components folder to merch_2023

* Add merch conditional rendering (WIP)

* Add function for merch is active or not

* Move merch types to data/types.ts

* Make cents mandatory for Price, change getAllPrices to return a map and use it in getAllProductsAndVariants

* Refactor merch.tsx getServerSideProps now that cents is guaranteed to be a member of Price

* Move 2024 MerchCard to its own file in components

* Fix imports for merch.tsx

* Fix cart.tsx import

* Fix pagination issue causing some sweaters (e.g. grey M/L) to show price $0 on cart

* Fix import

* Add merch closed messages to all relevant pages
@scorpiontornado
Copy link
Collaborator

LGTM 👍

@scorpiontornado scorpiontornado merged commit bf91ea0 into main Jul 29, 2024
2 checks passed
@scorpiontornado scorpiontornado deleted the merch-staging branch July 29, 2024 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants