Skip to content

Merge for third delivery of P2 #65

Merged
merged 83 commits into from
Oct 30, 2026
+5,305 −445
Merged

Merge for third delivery of P2 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
a6d0ce0
feat(backend): add artwork search with filtered pagination
karenska Oct 20, 2026
bdbbbed
test: add artwork search API tests
karenska Oct 20, 2026
be0971a
Merge pull request #37 from IT2810-H26/33-implement-artwork-search
karenska Oct 20, 2026
0ef3121
feat: add artist filtering and paginated artist options
karenska Oct 20, 2026
0e7afd4
test: add artist filtering and artist options API tests
karenska Oct 20, 2026
76d44dc
Merge pull request #38 from IT2810-H26/34-implement-artwork-filtering
karenska Oct 21, 2026
a50354f
feat: add artwork sorting with stable pagination
karenska Oct 21, 2026
7d50429
test: add artwork sorting API tests
karenska Oct 21, 2026
eab7b29
fix: ignore double quotes in title sorting
karenska Oct 22, 2026
5a29f3c
Merge pull request #39 from IT2810-H26/35-implement-artwork-sorting
karenska Oct 22, 2026
2744bf3
feat: support catalogue query options in useArtworks
karenska Oct 22, 2026
2b7c0b3
feat: add catalogue search controls
karenska Oct 22, 2026
a18bd59
style: format catalogue search controls
karenska Oct 22, 2026
94a7c82
feat: add searchable artist filter
karenska Oct 22, 2026
5540a1d
feat: add catalogue sorting controls
karenska Oct 22, 2026
419e028
feat: add result count and reset catalogue selections
karenska Oct 22, 2026
afe7076
style: align catalogue filters and add filter icon
karenska Oct 22, 2026
bed2216
style: unify catalogue selects and improve responsive layout
karenska Oct 22, 2026
2ef89d3
fix: place unknown artists last in artist sorting
karenska Oct 26, 2026
e891bd7
Merge pull request #42 from IT2810-H26/41-place-unknown-artists-last-…
karenska Oct 26, 2026
706129c
Merge pull request #40 from IT2810-H26/36-add-catalogue-search-filter…
karenska Oct 27, 2026
00a8ba5
feat: normalize and import numeric artwork dates
karenska Oct 27, 2026
0ef9494
feat: create profile page and user type
emmafre Oct 27, 2026
4022d07
feat: add script to backfill artwork dates
karenska Oct 27, 2026
d09d6f2
refactor: update CreateAccount to use the new user type
emmafre Oct 27, 2026
e9f10cd
refactor: update Login to use the new user type
emmafre Oct 27, 2026
30bf059
feat: add profile route in App
emmafre Oct 27, 2026
2701988
chore: rename pages to match with the established format
emmafre Oct 27, 2026
4e0a727
refactor: move typeDefs to a seperate file
emmafre Oct 27, 2026
87faf94
refactor: move password and user related code to seperate files
emmafre Oct 27, 2026
921b240
refactor: move artwork related code to a seperate file
emmafre Oct 27, 2026
8013cf6
refactor: rename index file and update dependencies
emmafre Oct 27, 2026
029bdd0
refactor: extract resolver code from server.ts to a seperate file
emmafre Oct 27, 2026
e43d1c8
fix: slow down artwork date backfill requests
karenska Oct 27, 2026
8dbd4c3
feat: add chronological artwork sorting with API tests
karenska Oct 27, 2026
2123f97
feat: add chronological sorting options to catalogue
karenska Oct 27, 2026
14cf95a
feat: create profile page base
emmafre Oct 27, 2026
134f982
feat: create gallery card
emmafre Oct 27, 2026
8a53e9e
feat: create GalleryModal for creation of new galleries
emmafre Oct 27, 2026
f48ab35
feat: implement creation of galleries for users
emmafre Oct 27, 2026
8f34a74
Merge remote-tracking branch 'origin/dev' into 44-create-user-page
emmafre Oct 28, 2026
f2e0ee8
Merge pull request #46 from IT2810-H26/44-create-user-page
emmafre Oct 28, 2026
03b22fe
feat: implement functionality for profile image
emmafre Oct 28, 2026
89404fe
feat: Created Footer
gurveers Oct 28, 2026
5a24c4f
fix: No footers on Login
gurveers Oct 28, 2026
062aead
feat: implement functionality for custom cover images
emmafre Oct 28, 2026
9048306
feat: add skeleton for profile- and cover image
emmafre Oct 28, 2026
eb0ed42
merge: integrate dev and preserve chronological sorting
karenska Oct 28, 2026
a3ebcd6
Merge pull request #45 from IT2810-H26/43-add-chronological-artwork-s…
karenska Oct 28, 2026
3bc1ff5
Merge pull request #50 from IT2810-H26/49-create-footer
gurveers Oct 28, 2026
f9d11fc
Merge pull request #51 from IT2810-H26/48-add-profile-and-cover-image…
emmafre Oct 29, 2026
b6d5bb6
feat: add artwork detail data to backend
minael Oct 29, 2026
7c1cf39
feat: add artwork detail navigation and fetching
minael Oct 29, 2026
b457fd1
feat: add artwork detail page
minael Oct 29, 2026
6454179
docs: add AI usage comment
minael Oct 29, 2026
ee86c37
feat: add back button to artwork detail page
minael Oct 29, 2026
2db3507
style: adjust artwork detail layout for large screens
minael Oct 29, 2026
b34c049
Merge pull request #53 from IT2810-H26/47-implement-artwork-detail-page
minael Oct 29, 2026
39fd421
feat: add artworks to galleries
minael Oct 29, 2026
6502d8f
fix: show gallery cover image
minael Oct 29, 2026
f379b02
feat: support up to 3 images in gallery cover
minael Oct 29, 2026
680298d
style: adjust gallery cover image proportions
minael Oct 29, 2026
170dfef
style: add spacing above footer on profile page
minael Oct 29, 2026
e30e0cf
Merge pull request #56 from IT2810-H26/54-add-artworks-to-gallary
minael Oct 29, 2026
0f9d074
fix: protect profile page from unauthenticated users
minael Oct 29, 2026
5ef80fa
chore: fix navigation in hero
minael Oct 29, 2026
a13ae43
chore: change navigation from login to profile page
minael Oct 29, 2026
45daa0b
chore: redirect new users to profile after registration
minael Oct 29, 2026
d930fcb
feat: add back and logout navigation to profile
minael Oct 29, 2026
7749181
fix: add pointer cursor to logout button
minael Oct 29, 2026
e99e0a0
fix: add pointer cursor to add button
minael Oct 29, 2026
6d7b828
Merge pull request #57 from IT2810-H26/52-limit-not-logged-in-users
minael Oct 29, 2026
9381a23
feat: add Zustand auth store
minael Oct 29, 2026
a47eb93
refactor: use auth store for login and registration
minael Oct 29, 2026
2a68b56
refactor: use auth store for profile navigation
minael Oct 29, 2026
50fdd1a
refactor: use shared auth token in gallery modals
minael Oct 29, 2026
295b325
docs: update readme for delivery 3
minael Oct 30, 2026
0ed564f
Merge pull request #60 from IT2810-H26/55-add-shared-state-management…
minael Oct 30, 2026
dc3fa49
Merge pull request #61 from IT2810-H26/59-update-readme-for-delivery-3
minael Oct 30, 2026
69d87b3
chore: fix frontend dependency vulnerabilities
minael Oct 30, 2026
46a9aea
chore: fix backend dependency vulnerabilities
minael Oct 30, 2026
92df406
style: format code with Prettier
minael Oct 30, 2026
4393be8
Merge pull request #62 from IT2810-H26/58-fix-prettier-formatting
minael Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ dist-ssr
*.njsproj
*.sln
*.sw?
.env
221 changes: 166 additions & 55 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

Loading