Repository navigation
Gallery-hover-animation - #311
Merged
Merged
Conversation
This reverts commit 7a43579.
…o ryan/merch-page
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
yrska
requested changes
Oct 1, 2026
yrska
left a comment
yrska
left a comment
Collaborator
There was a problem hiding this comment.
Behind main, needs trimming:
- Remove .claude/launch.json
- Remove merch related changes.
Core functionality is fine
olivia2450
added a commit
that referenced
this pull request
Oct 1, 2026
…d by #311; remove duplicate migration causing migrate:fresh failures
Also drop .claude/launch.json and stray merch files (header/MerchItemCard.tsx, header/MerchProductSection.tsx) carried over from ryan/merch-page. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
yrska
approved these changes
Oct 7, 2026
yrska
enabled auto-merge (squash)
October 7, 2026 22:28
|
🚀 Preview deployment is live: Preview Link |
yrska
added a commit
that referenced
this pull request
Oct 8, 2026
* Create Merch product sections global schema * Fix merch-content schema to match sections[]/products[] shape expected by #311; remove duplicate migration causing migrate:fresh failures * chore(migrations): squash merch-content migrations into one The two migrations added in this PR created the per-product columns and then dropped them all in favour of sections/products. Replace them with a single generated migration. The resulting schema snapshot is identical to the previous final snapshot. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(cms): restore five-section merch-content schema Bring the merch-content global back to the shape ticket #230 asks for: T-Shirts, Stickers, Board Shorts, Towel Poncho and Sweatshirt groups, each with label, heading, body, image and badge, plus the Towel Poncho annotations, Board Shorts caption and group photo, and Sweatshirt year label and two images. Regenerate types and replace the migration. The migration first drops any merch_content tables left by earlier revisions of this PR, so it also runs on databases that applied those. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(cms): cover merch-content global schema Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: yrska <jonathanw15382@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Jonathan Wu <158560545+yrska@users.noreply.github.com>
This branch was successfully deployed
This file contains hidden or 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
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.
No description provided.