Skip to content

Merge dev into main #48

Jump to bottom
Merged
merged 126 commits into from
Apr 21, 2026
Merged

Merge dev into main #48

merged 126 commits into from
Apr 21, 2026
+4,053 −285

Conversation

mariukle
Copy link
Member

Merges all completed features from dev branch into main. Current state includes:

  • User registration and login
  • Browse and search organizations
  • Donation flow with authentication check
  • User profile with donation history and statistics
  • Dark blue UI theme

haavajor and others added 30 commits March 5, 2026 11:36
@haavajor
Unit tests for Donation, User, and Organization classes
e2760fb
Fixed main class configuration
16b15ab
Removed unnecessary file
2f72518
Removed unnecessary file
6b34569
Class to move between scenes
3edb587
Changed name to big capital letter
9ff4e73
css style for buttons
fe5cf4d
Created homepage and sign in page for application
0b68fc4
Controller for homepage
1e6fe5d
Controller for sign in page
d985616
Changed name for userLogin to userSignIn
e68902a
Updated main to show application
e58c20b
Connected loggin use case to javafx
4da4e06
Made switch method with path and also controller as parameter
d81a1a6
Added email validation
74e1a08
Added email validation
c53f3bb
Made register page
22c7cf8
Slutt å spore givehope.db
40ce85f
Merge GUI - fjern givehope.db
fb8b4af
refactor: update organization table columns to match Innsamlingskontr…
79773d1 
…ollen API fields
refactor: set initalize method to public
a65b2ca
refactor: Changed class to match Innsamlingskontrollen API
97beba5
feat: add OrganizationDAO for saving and retrieving organizations
afe74c1
feat: connect explore organization button to OrganizationsView
bfad5ab
feat: connect explore organization button to OrganizationsView
84c54da
feat: created controller for OrganizationsView
cd6a72f
feat: add organization view with search and pagination
86087d7
@lukasce
Merge branch 'DEV' into donation
a983a95
style: apply consistent design system across all pages
eed6746
feat: add SessionManager to track signed-in user state
dfd90cb
Marius Klepp and others added 19 commits April 15, 2026 11:55
feat: add fetchDetails method to scrape description and logo from Inn…
93d9ab7 
…samlingskontrollen
refactor: move shared button styles to Global.css and clean up unused…
bacf2ec 
… styles
chore: minor changes
6f8eb57
@mariukle
Merge pull request #43 from Gruppe-26-IDATT1005/feature/detail-page
b151990 
Feature/detail page
@lukasce
Merge branch 'DEV' into documentation/javadoc
6c6829b
@lukasce
Merge pull request #44 from Gruppe-26-IDATT1005/documentation/javadoc
47ecb83 
Documentation/javadoc
@haavajor
Merge branch 'DEV' into UnitTests
e9ee649
Deleted not-used CauseDao class
64e470c
@haavajor
Merge branch 'DEV' into Backend-UnitTests
7ab1429
@haavajor
Merge pull request #46 from Gruppe-26-IDATT1005/Backend-UnitTests
74f2cc5 
Backend unit tests
@haavajor
Merge pull request #45 from Gruppe-26-IDATT1005/UnitTests
bfa99ed 
Unit tests
Javadoc for UI classes
3708901
Documentation: Added javadoc and removed unused method and files
e22cc28
Documentation: Added javadoc and removed unused method and files
c04752c
Merge branch 'DEV' into documentation/javadoc
dcfbc7b
Merge with dev
124278e
@mariukle
Merge pull request #47 from Gruppe-26-IDATT1005/documentation/javadoc
44eb8fc 
Documentation/javadoc
fixed package-import bug
e1eb759
Refactor: moved OrganizationDetails to integration, since its job is …
66b0475 
…to be an object that tranfers data
@mariukle mariukle requested a review from lukasce April 20, 2026 12:47
@lukasce lukasce merged commit ac01ab2 into main Apr 21, 2026
1 check failed
Sign in to join this conversation on GitHub.
Reviewers

@lukasce lukasce lukasce approved these changes

Assignees
No one assigned
Labels
None yet
Projects
idatt1005_2026_26
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mariukle @lukasce @haavajor