Merging Olha's branch into main branch - #130

Open

colaola20 wants to merge 65 commits into

codepath:mainfrom

Commits on Apr 7, 2026

Updated readme.md
colaola20
committed
7b31749
Added app's description and purpose.
colaola20
committed
413f3b8
milestone1
JPR420
committed
c83b4f7
Test Commit
JPR420
committed
8453749
Merge pull request #1 from colaola20/JPR-Dev
JPR420
authored
1f96463
Improve formatting of installation instructions
colaola20
authored
9a4f737

Commits on Apr 8, 2026

Update wireframes and add new page details
colaola20
authored
8b7e8bc
Update checklist to mark wireframes task as complete
colaola20
authored
c478e85
Update wireframes.md
colaola20
authored
a9f9ef0
Update entity relationship diagram with new tables
colaola20
authored
caf0eea
Refactor user stories in planning document
colaola20
authored
3b75345
Update user story to filter notes by categories and tags
colaola20
authored
8c3536a
Update milestone2.md with completed tasks
colaola20
authored
82027bb

Commits on Apr 11, 2026

Connection to database
JPR420
committed
008ca36
reUploading branch
JPR420
committed
335725e
Merge pull request #2 from colaola20/JPR-Dev
JPR420
authored
e095640
Full CRUD operation enpoints.
JPR420
committed
f41b886

Commits on Apr 14, 2026

Filled out Reflection section for milestone2.
colaola20
committed
8eb442d

Commits on Apr 16, 2026

fix: Return userID from register endpoint for auto-login
SingLZ
committed
fd6d34a
deps: Add react-router-dom for routing
SingLZ
committed
599d822
feat: Create AuthContext for user state management
SingLZ
committed
9675657
feat: Add Login page component
SingLZ
committed
6f01a3e
feat: Add Register page component with password validation
SingLZ
committed
1384ba6
feat: Add ProtectedRoute component for route protection
SingLZ
committed
e334bc5
style: Add Auth page styling
SingLZ
committed
5dbf18e
feat: Add authentication API endpoints (login, register)
SingLZ
committed
cffc21c
feat: Setup app routing with protected routes
SingLZ
committed
bc89777
dashboard page
SingLZ
committed
686055f
note modal
SingLZ
committed
ed4a787
Merge branch 'main' of https://github.com/colaola20/web103_finalproject into Sing-Dev
SingLZ
committed
2849e41

Commits on Apr 20, 2026

Error messages now shown to the user
JPR420
committed
3abb6f1
Milestone 3
JPR420
committed
9820fd8

Commits on Apr 21, 2026

Commits on Apr 22, 2026

Commits on Apr 23, 2026

Commits on Apr 24, 2026

Merge branch 'main' of https://github.com/colaola20/web103_finalproject into JPR-Dev
JPR420
committed
7cde2fd

Commits on Apr 25, 2026

Notes can be added, deleted and updated.
JPR420
committed
6619686
Ai feature Working
JPR420
committed
9710d5b
database reset
JPR420
committed
6a47630
readme update
JPR420
committed
891cc9d
style fix to add note modal
SingLZ
committed
5771fb6
Moved categories from header into notes section. Changes add categories and setting buttons' styles, so it stay consistent.
colaola20
committed
75d4a96
Change style of header and body, so it all consistet and clean.
colaola20
committed
8191f6b
Improved CategoryModel component style.
colaola20
committed
bbf19d5
Fixed submit action on CategoryModal.
colaola20
committed
5a3b2d3
Added 'Show All' categories btn and ShowCategoriesModal modal with their style.
colaola20
committed
c0eb6e3
Improved style of ShowCategoriesModal.
colaola20
committed
947cd6d

Commits on Apr 26, 2026

Commits on Apr 29, 2026

Updated readme and milesnote md.
colaola20
committed
7a4447d
Fix pin feature in add note modal.
colaola20
committed
287dd02
Added tags filtering.
colaola20
committed
bfd3e50
Made auth-container box full screen size.
colaola20
committed
67c0a5e
Improved style of auth pages.
colaola20
committed
2c19d63
Added mergin-top to pinned note title.
colaola20
committed
fd854c2