Skip to content

Issue 8 resolve merge conflict#37

Merged
Karl-Sue merged 10 commits intoissue-8-Individual_art_pagesfrom
issue-8-resolve-merge-conflict
Dec 13, 2025
Merged

Issue 8 resolve merge conflict#37
Karl-Sue merged 10 commits intoissue-8-Individual_art_pagesfrom
issue-8-resolve-merge-conflict

Conversation

@Karl-Sue
Copy link
Collaborator

@Karl-Sue Karl-Sue commented Dec 13, 2025

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

  • Refactored ButtonGallery component to use Next.js Link component properly
  • Added placeholder SVG icon for artworks without images
  • Centralized mock data generation in useArtworkData.ts hook
  • Added error handling in getServerSideProps to return mock data when API fails or DB is empty
  • Improved responsive layouts with proper spacing and mobile-first approach
  • Fixed TypeScript type issues with Next.js route parameters and PageResult types

Change Form

  • The pull request title has an issue number (Individual art pages #8)
  • The change works by "Smoke testing" or quick testing
  • The change has tests - NA: Mock data hook doesn't require unit tests at this stage
  • The change has documentation - NA: Changes are self-explanatory code refactoring

Other Information

  • This PR resolves merge conflicts from issue-8. The mock data generators in useArtworkData.ts provide 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.
  • Add module django_filters.rest_framework - need confirmation

Testing Notes:

  • Tested with empty database - placeholder icons display correctly
  • Tested navigation between gallery and individual artwork pages
  • Verified responsive layout on mobile and desktop viewports

Related issue

Copy link
Contributor

@laurenpudz laurenpudz left a comment

Choose a reason for hiding this comment

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

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.

@Karl-Sue Karl-Sue merged commit fd90b63 into issue-8-Individual_art_pages Dec 13, 2025
5 checks passed
@Karl-Sue Karl-Sue deleted the issue-8-resolve-merge-conflict branch December 13, 2025 06:56
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.

3 participants