Issue 8 resolve merge conflict#37
Merged
Karl-Sue merged 10 commits intoissue-8-Individual_art_pagesfrom Dec 13, 2025
Merged
Conversation
laurenpudz
approved these changes
Dec 13, 2025
Contributor
laurenpudz
left a comment
There was a problem hiding this comment.
for merging into branches aside from main you don't need to make a PR, you can just merge normally. I have approved the PR so you can merge using the PR if you would like.
hanminh1203
reviewed
Dec 13, 2025
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.
Change Summary
Improved responsive design and refactored artwork pages to follow Next.js best practices. Centralized mock data generation into a reusable hook and added proper error handling for empty database states.
Changes Made
ButtonGallerycomponent to use Next.jsLinkcomponent properlyuseArtworkData.tshookgetServerSidePropsto return mock data when API fails or DB is emptyChange Form
Other Information
useArtworkData.tsprovide fallback data when the Django backend has no artwork entries yet, ensuring the frontend remains functional during development. The placeholder SVG will display for artworks without images uploaded.Testing Notes:
Related issue