-
Notifications
You must be signed in to change notification settings - Fork 3
Issue 8 individual art pages #41
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
base: main
Are you sure you want to change the base?
Conversation
…/game-dev into issue-8/art-page
…flict Issue 8 resolve merge conflict
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the thorough review, James. I've made the following changes:
-
Removed django-filter dependency:
Deleted the DjangoFilterBackend import and related configuration from views.py
Removed django-filter==24.3 from requirements.txt -
Refactored database models:
Removed social media fields (discord_url, instagram_url) from the Member model
Deleted the erroneous Migration 0007 (which attempted to add social media fields to ArtContributor)
Kept ArtContributor as a pure association table containing only art, member, role
Updated related serializers to remove social media field references -
Simplified URL configuration:
Simplified the router configuration in urls.py as requested -
Other improvements:
Replaced unique_together with UniqueConstraint
Added default=True to Art.active
All changes have been pushed, and the code now fully conforms to the original schema design. Thank you for your careful review. During multiple rounds of modifications, I lost sight of the original design requirements and added a lot of code based on my own assumptions without consulting first. I apologize for that.
|
The latest version of the code resolved two tickets:
|
laurenpudz
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hello!! could you please resolve the conflicts between this branch and the main branch, thanks!
|
Hey! Seems like some conflicts have cropped up since the new events page was merged into main. Please could you resolve these too! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes to the poetry lock should be reverted since the python packages used haven't changed.
| fontFamily: { | ||
| sans: ["var(--font-sans)", ...fontFamily.sans], | ||
| jersey10: ["var(--font-jersey10)", ...fontFamily.sans], | ||
| jersey10: ["Jersey 10", ...fontFamily.sans], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this font's definition changed?
| sans: ["var(--font-sans)", ...fontFamily.sans], | ||
| jersey10: ["var(--font-jersey10)", ...fontFamily.sans], | ||
| jersey10: ["Jersey 10", ...fontFamily.sans], | ||
| dmSans: ["DM Sans", ...fontFamily.sans], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This font may need to be included in the _app.tsx like the others to make sure the font will be available for all browsers.
| sans: ["var(--font-sans)", ...fontFamily.sans], | ||
| jersey10: ["var(--font-jersey10)", ...fontFamily.sans], | ||
| jersey10: ["Jersey 10", ...fontFamily.sans], | ||
| dmSans: ["DM Sans", ...fontFamily.sans], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We actually shouldn't need this font at all as we already have another sans font in the project. You can remove this and just use font-sans instead. Having two very similar but slightly different fonts used inconsistently will not be great aesthetics-wise
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
Testing Notes:
Related issue