Skip to content

Commit

Permalink
Merge branch 'main' of git.ntnu.no:cathrkri/systemutviklingTeam6
Browse files Browse the repository at this point in the history
  • Loading branch information
AdrianBalunan committed Feb 12, 2026
2 parents 225b8cb + 4e2060e commit 7dc1ada
Show file tree
Hide file tree
Showing 23 changed files with 117 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/Prosjekt-Repo.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed docs/Domenemodell/DOMENE MODELL av Help Me Help.pdf
Binary file not shown.
Binary file added docs/Domenemodell/Domain Model Fixed.drawio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/Domenemodell/Domain Model Fixed.pdf
Binary file not shown.
Binary file removed docs/Domenemodell/Domain Model.pdf
Binary file not shown.
Binary file removed docs/Domenemodell/Domain Model.png
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion helpmehelpapplication/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<artifactId>helpmehelpapplication</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<properties>
<maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>25</maven.compiler.target>
</properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.models;

public class Charity {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.models;

public class Donation {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.models;

public class Feedback {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.models;

public class Role {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.models;

public class User {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.service;

public class AuthenticationService {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.service;

public class CharityService {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.service;

public class DonationService {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package ntnu.sytemutvikling.team6.service;

public class FeedbackService {
}

0 comments on commit 7dc1ada

Please sign in to comment.