Repository navigation

Unifying art branches - #155

Merged

laurenpudz merged 156 commits into

mainfrom

unifying_art_branches

Jul 25, 2026

Merged

Unifying art branches#155
laurenpudz merged 156 commits into
mainfrom
unifying_art_branches

Commits on Nov 25, 2025
- feat: add Art model
  Karl-Sue
  committed
  66f1c0d
Commits on Nov 26, 2025
- refactor: keep model register minimal
  Karl-Sue
  committed
  ddbf780
Commits on Nov 28, 2025
- Add ArtContributor model with API endpoints
  DDuu123321
  committed
  b26d12d
Commits on Dec 5, 2025
- art-page-frontend
  hanminh1203
  committed
  8ac4927
Commits on Dec 6, 2025
- art-page-frontend
  hanminh1203
  committed
  8b98a06
- Merge branch 'issue-8/art-page' of https://github.com/codersforcauses/game-dev into issue-8/art-page
  hanminh1203
  committed
  67ba4d8
- refactor: keep admin register simple
  Karl-Sue
  committed
  7f91e0b
- fix: space error
  Karl-Sue
  committed
  aeedeec
Commits on Dec 10, 2025
- Load arts from backend
  hanminh1203
  committed
  31954af
- Change field name style
  hanminh1203
  committed
  9e67fa6
- Readd art field to create data
  hanminh1203
  committed
  c955b14
- Make the image height corresponding to the text
  hanminh1203
  committed
  c10ee23
- Filter on backend + include contributors into art
  hanminh1203
  committed
  9af2dc9
- Add Pagination on backend
  hanminh1203
  committed
  1f2ce0c
- Improve frontend to support responsive
  hanminh1203
  committed
  eed05ce
- Improve resize image
  hanminh1203
  committed
  a1371d6
- Back button padding
  hanminh1203
  committed
  1f1958c
Commits on Dec 13, 2025
- feature: improve responsive layout
  Karl-Sue
  committed
  f4d442a
- fix: resolve merge conflicts in artwork pages
  Karl-Sue
  committed
  ac79752
- feat: add Art hook
  Karl-Sue
  committed
  3b5607e
- feat: add Artwork hook
  Karl-Sue
  committed
  2e9ef67
- feat: add placeholder art
  Karl-Sue
  committed
  3d38119
- Fix flake8
  hanminh1203
  committed
  0b4164d
- fix: match Prettier code style
  Karl-Sue
  committed
  45afd6d
- Fix flake8
  hanminh1203
  committed
  b7273d5
- Merge pull request #37 from codersforcauses/issue-8-resolve-merge-conflict
  Karl-Sue
  authored
  fd90b63
Commits on Dec 20, 2025
- Refactor code for reuseability
  hanminh1203
  committed
  53e30c3
- Error message
  hanminh1203
  committed
  b234e60
- Remove mock data on Frontend
  hanminh1203
  committed
  cc4ac45
- Merge remote-tracking branch 'origin/main' into issue-8-Individual_art_pages
  hanminh1203
  committed
  fb3f1c9
- Solve conflict and adapt code
  hanminh1203
  committed
  f0c5e4c
- fix flake8 on backend
  hanminh1203
  committed
  08f0865
- Fix Prettier and type check
  hanminh1203
  committed
  23b65ea
- Correct django-filter version
  hanminh1203
  committed
  6cc9d1c
- Commit poetry.lock
  hanminh1203
  committed
  39306ef
- Commit poetry.lock
  hanminh1203
  committed
  d564d05
- Correct script order
  hanminh1203
  committed
  b0a3062
- Correct script order
  hanminh1203
  committed
  d1c5ee9
Commits on Jan 6, 2026
- feat: implement individual art pages with full functionality
  DDuu123321
  committed
  c820c7d
- fix: remove null=True from URLField to pass flake8
  DDuu123321
  committed
  2112171
- style: fix prettier formatting in error-modal.tsx
  DDuu123321
  committed
  6640e7f
Commits on Jan 7, 2026
- Remove the import and then add the icon import: Discord and Instagram
  DDuu123321
  committed
  f77d7a7
- Fix import formatting in [id].tsx
  DDuu123321
  authored
  4277b4d
Commits on Jan 9, 2026
- feature: add mock data for dev
  Karl-Sue
  committed
  959c3e1
- chore: update migrations and frontend components
  DDuu123321
  committed
  6a7a5e0
- style: fix prettier formatting issues in [id].tsx
  DDuu123321
  committed
  e971856
Commits on Jan 14, 2026
Commits on Jan 16, 2026
- Fix: Remove hardcoded social media fields to comply with schema design
  DDuu123321
  committed
  2951ead
- Resolve merge conflict in Navbar: keep z-100 from main
  DDuu123321
  committed
  1138ccb
- Fix: Remove django_filters import and usage from views.py
  DDuu123321
  committed
  6df9c3d
- Update views.py
  DDuu123321
  authored
  8e9de27
- Fix: Add newline at end of views.py
  DDuu123321
  committed
  85ea95d
Commits on Jan 17, 2026
- refactor: remove pagination
  Karl-Sue
  committed
  163cc05
- refactor: change from viewset to a standard RetrieveAPIView
  Karl-Sue
  committed
  57a7a84
- bug: remove leftover code:
  Karl-Sue
  committed
  752ed72
- Create backend model and API to retrieve featured art pieces.
  hanminh1203
  committed
  ec5f54a
- refactor: remove redundant file
  Karl-Sue
  committed
  2a1cea8
- bug: fix the unused components error
  Karl-Sue
  committed
  7afaaa9
- Merge branch 'main' into issue-8-Individual_art_pages
  Karl-Sue
  committed
  1900c91
- Merge branch 'main' into issue-8-feature
  Karl-Sue
  committed
  255583e
- Merge branch 'main' into issue-8-Individual_art_pages
  SafetyInObscurity
  committed
  1a41234
- Merge branch 'main' into issue-8-Individual_art_pages
  SafetyInObscurity
  committed
  60c5243
Commits on Jan 21, 2026
- Merge branch 'main' into issue-8-Individual_art_pages
  DDuu123321
  authored
  cfda27b
- refactor: redesign artshowcase
  Karl-Sue
  committed
  665ac3d
- fix: styling
  Karl-Sue
  committed
  387fbf0
Commits on Jan 24, 2026
- feat: add interactive artwork cards with flip animation and responsive navigation
  Karl-Sue
  committed
  c487a57
- Merge branch 'issue-8-feature' into issue-8-Individual_art_pages
  Karl-Sue
  committed
  8d20e20
- merge: resolve merge conflict when merging main
  Karl-Sue
  committed
  5deca41
- refactor: remove discord + insta url for frontend
  Karl-Sue
  committed
  ab4a7ee
- refactor: remove basedto + page-reponse
  Karl-Sue
  committed
  0a6c08c
- styling: using font-sans instead of font-jersey10
  Karl-Sue
  committed
  08b4de6
Commits on Jan 27, 2026
- Fix: Remove deprecated social media fields and unify font usage
  DDuu123321
  committed
  ca9ec39
Commits on Jan 30, 2026
- Merge branch 'main' into issue-8-Individual_art_pages
  DDuu123321
  authored
  d455d9c
- Merge conflicting migrations
  DDuu123321
  committed
  1f56957
- Fix flake8 formatting error
  DDuu123321
  committed
  fd39a11
Commits on Jan 31, 2026
- conflict: merge main
  Karl-Sue
  committed
  76e5048
- add: migration
  Karl-Sue
  committed
  bd8ad2b
- merge: issue 40
  Karl-Sue
  committed
  46bb94c
Commits on Feb 2, 2026
- Fix API response for featured arts
  DDuu123321
  committed
  7b047ef
Commits on Feb 4, 2026
- merge: issue-40/backend
  Karl-Sue
  committed
  ae42906
- add: migration
  Karl-Sue
  committed
  fb56dfc
- refactor: change api response
  Karl-Sue
  committed
  2f50442
- merge: main + resolve conflict
  Karl-Sue
  committed
  c84e9dc
- added source_game fields to the API
  DDuu123321
  committed
  0aa032d
- add: migration
  Karl-Sue
  committed
  7793066
- fix: eslint type
  Karl-Sue
  committed
  7ac5eeb
Commits on Feb 7, 2026
- refactor: use svgs instead of inline declaration
  Karl-Sue
  committed
  e130d81
- refactor: using AddConstraint in migration instead of AlterConstraint
  Karl-Sue
  committed
  8853c77
- Merge remote-tracking branch 'origin/issue-40/backend' into issue-8-merge-40
  Karl-Sue
  committed
  f82e5e2
- feature: connect frontend + backend
  Karl-Sue
  committed
  a12b072
- feature: add tests for art model
  Karl-Sue
  committed
  626ac05
- feature: add fallback when server fail
  Karl-Sue
  committed
  319b1a2
Commits on Feb 11, 2026
- feature: add api endpoint /api/arts/[id]
  Karl-Sue
  committed
  1246ac5
- fix: eslint error
  Karl-Sue
  committed
  f72ee8a
Commits on Feb 13, 2026
- add art doc
  Karl-Sue
  committed
  0e2e2b4
Commits on Feb 14, 2026
- fix: art documentation - provide more details
  Karl-Sue
  committed
  03f7e1a
- refactor: move file location to /client, next to src and public
  Karl-Sue
  committed
  e99cb33
- refactor: Art class for consistency with Game team issue #81
  Karl-Sue
  committed
  7e445c9
Commits on Feb 18, 2026
- merge: resolve merge conflict with main branch
  Karl-Sue
  committed
  5ca579c
Commits on Feb 21, 2026
- Reworked how pronouns and names are arranged
  
  Games4Doritos
  authored and
  Karl-Sue
  committed
  cfe92cb
- Undid ternary logic for pronouns
  
  Games4Doritos
  authored and
  Karl-Sue
  committed
  ab66a47
- changed the python version constraints in the pyproject.toml to avoid using 3.14, which is incompatible with django 5.1.15
  
  samjjacko
  authored and
  Karl-Sue
  committed
  6030880
- linked landing page buttons to game and art showcase respectively
  
  “KushPatel-18”
  authored and
  Karl-Sue
  committed
  a38fe17
- Added member profile documentation
  
  belledw
  authored and
  Karl-Sue
  committed
  c8854b2
- Added social media link information to the member profile documentation
  
  belledw
  authored and
  Karl-Sue
  committed
  ba34f30
- 404 page stuffs
  
  saltyypringle
  authored and
  Karl-Sue
  committed
  7952656
- fixed small styling
  
  saltyypringle
  authored and
  Karl-Sue
  committed
  21ec32f
- typo
  
  saltyypringle
  authored and
  Karl-Sue
  committed
  5b81c47
- moved the trivia to a json file
  
  saltyypringle
  authored and
  Karl-Sue
  committed
  981ffc8
- prettier
  
  saltyypringle
  authored and
  Karl-Sue
  committed
  f9ede4f
- Update client/src/pages/404.tsx
  
  authored and
  Karl-Sue
  committed
  efdee09
- Update client/src/pages/404.tsx
  
  authored and
  Karl-Sue
  committed
  da1caa5
- fixed styling for mobile view
  
  saltyypringle
  authored and
  Karl-Sue
  committed
  544b666
- resolve conflict between remote and local branch
  Karl-Sue
  committed
  5d5df64
- still needs a description potentially
  KKatariah
  committed
  25c468f
- fix: remove unnecessary test
  Karl-Sue
  committed
  98880aa
- fix: formatting
  Karl-Sue
  committed
  876d7cd
- delete: placeholder image that is no longer needed
  Karl-Sue
  committed
  29babd8
- delete: redundant comment
  Karl-Sue
  committed
  120cb70
Commits on Mar 1, 2026
- Merge branch 'main' into issue-8-merge-40
  laurenpudz
  committed
  7e79d4f
- remove old migrations
  laurenpudz
  committed
  5cd8f7c
- get rid of svgs and unnecessary components
  laurenpudz
  committed
  942133f
- simplify individual art page and contributor list
  laurenpudz
  committed
  7ea45a1
- make individual page somewhat responsive
  laurenpudz
  committed
  c04847e
- start cleaning up showcase page
  laurenpudz
  committed
  67def40
Commits on Mar 28, 2026
- Merge branch 'main' into issue-93-events_documentation
  Games4Doritos
  committed
  095b63b
- Refined Events docs
  Games4Doritos
  committed
  f18ed12
Commits on Apr 4, 2026
- Fixing test and flake8 errors
  SafetyInObscurity
  committed
  f8395b4
- Merge branch 'main' into issue-8-merge-40
  SafetyInObscurity
  committed
  8d35c4f
- Merge migrations
  SafetyInObscurity
  committed
  80a53e3
Commits on Apr 15, 2026
- Merge remote-tracking branch 'origin/main' into issue-96-contributors_documentation
  samjjacko
  committed
  3e30b57
- Merge remote-tracking branch 'origin/main' into issue-93-events_documentation
  samjjacko
  committed
  95f87ee
- added url
  samjjacko
  committed
  87aea7e
- renamed and removed random script directory
  samjjacko
  committed
  22c27c3
- merged issue-81 into this branch
  samjjacko
  committed
  06d08d6
Commits on Apr 16, 2026
- glued branches together, refactored a bit and wrote some logic to display artwork on individual member's pages properly
  samjjacko
  committed
  2d68543
- Merge branch 'issue-96-contributors_documentation' into unifying_art
  samjjacko
  committed
  f02f14b
- Merge branch 'issue-93-events_documentation' into unifying_art_branches
  samjjacko
  committed
  0f3c3a7
- added events documentation
  samjjacko
  committed
  f8ee130
- genuinely have no idea how duplicates emerged
  samjjacko
  committed
  0fc6ef3
- prettier
  samjjacko
  committed
  8208665
Commits on Jul 11, 2026
- Correct migrations
  SafetyInObscurity
  committed
  c9c1823
- quick fixes - add utility classes and remove commentsd
  laurenpudz
  committed
  16b1109
Commits on Jul 18, 2026
- remove artwork mocking
  laurenpudz
  committed
  7b12876
- remove console logs
  laurenpudz
  committed
  a210408
Commits on Jul 19, 2026
- fixed (to my understanding) the get_artwork serialiser function
  samjjacko
  committed
  fbdad17
Commits on Jul 21, 2026
- made a rudimentary sliding carousel for the featured artwork. borders glitchy. Wasn't like this b4.
  samjjacko
  committed
  f6c2f5f
- fixed flickering, but at what cost
  samjjacko
  committed
  7a7a787
Commits on Jul 22, 2026
- Carousel stops on scroll now instead of hover, and can be scrolled. cards expand on hover, too
  samjjacko
  committed
  f87efc0
Commits on Jul 24, 2026
- decided that draggable carousels made more sense. helps simplify things too, surprisingly
  samjjacko
  committed
  d4137b5
- fixed the most obvious hydration error of all time
  samjjacko
  committed
  1e9c3cb
- minor fixes
  samjjacko
  committed
  13128f9
- merge main into unifying_art_branches
  samjjacko
  committed
  31cb64d
Commits on Jul 25, 2026
- fix padding for mobile
  laurenpudz
  committed
  ccb89c2

Commits

Commits on Nov 25, 2025

Commits on Nov 26, 2025

Commits on Nov 28, 2025

Commits on Dec 5, 2025

Commits on Dec 6, 2025

Commits on Dec 10, 2025

Commits on Dec 13, 2025

Commits on Dec 20, 2025

Commits on Jan 6, 2026

Commits on Jan 7, 2026

Commits on Jan 9, 2026

Commits on Jan 14, 2026

Commits on Jan 16, 2026

Commits on Jan 17, 2026

Commits on Jan 21, 2026

Commits on Jan 24, 2026

Commits on Jan 27, 2026

Commits on Jan 30, 2026

Commits on Jan 31, 2026

Commits on Feb 2, 2026

Commits on Feb 4, 2026

Commits on Feb 7, 2026

Commits on Feb 11, 2026

Commits on Feb 13, 2026

Commits on Feb 14, 2026

Commits on Feb 18, 2026

Commits on Feb 21, 2026