diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bee94ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +############################## +## Java +############################## +.mtj.tmp/ +*.class +*.jar +*.war +*.ear +*.nar + +############################## +## Maven +############################## +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +pom.xml.bak +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + +############################## +## IntelliJ +############################## +out/ +.idea/* +*.iml +*.ipr +*.iws + +############################## +## Database +############################## +*.db +*.DS_Store diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..dc3b895 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9be90b9..4895163 100644 --- a/pom.xml +++ b/pom.xml @@ -1,103 +1,85 @@ + 4.0.0 edu.group5.app Help-Me-Help 1.0-SNAPSHOT - Help-Me-Help - - http://www.example.com + https://git.ntnu.no/Group-5/Help-Me-Help - UTF-8 - 25 - + UTF-8 + 25 + 25.0.1 + 6.0.1 + - - - org.junit - junit-bom - 5.11.0 - pom - import - + + + org.junit.jupiter + junit-jupiter + ${junit.version} + test + + + + + org.openjfx + javafx-controls + ${javafx.version} + - - - - org.junit.jupiter - junit-jupiter-api - test - - - - org.junit.jupiter - junit-jupiter-params - test - - - org.openjfx - javafx-controls - 25.0.1 - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.1 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.4 + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + + edu.group5.app.App + + + + + + + + org.openjfx + javafx-maven-plugin + 0.0.8 + + edu.group5.app.App + + - - - - - - maven-clean-plugin - 3.4.0 - - - - maven-resources-plugin - 3.3.1 - - - maven-compiler-plugin - 3.13.0 - - - maven-surefire-plugin - 3.3.0 - - - maven-jar-plugin - 3.4.2 - - - maven-install-plugin - 3.1.2 - - - maven-deploy-plugin - 3.1.2 - - - - maven-site-plugin - 3.12.1 - - - maven-project-info-reports-plugin - 3.6.1 - - - org.openjfx - javafx-maven-plugin - 0.0.8 - - edu.group5.app.App - - - - - + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.12.0 + + + diff --git a/src/main/java/edu/group5/app/control/Wrapper.java b/src/main/java/edu/group5/app/control/Wrapper.java new file mode 100644 index 0000000..9655c26 --- /dev/null +++ b/src/main/java/edu/group5/app/control/Wrapper.java @@ -0,0 +1,5 @@ +package edu.group5.app.control; + +public class Wrapper { + +} diff --git a/src/main/java/edu/group5/app/model/donation/Donation.java b/src/main/java/edu/group5/app/model/donation/Donation.java new file mode 100644 index 0000000..a127439 --- /dev/null +++ b/src/main/java/edu/group5/app/model/donation/Donation.java @@ -0,0 +1,5 @@ +package edu.group5.app.model.donation; + +public class Donation { + +} diff --git a/src/main/java/edu/group5/app/model/organization/Organization.java b/src/main/java/edu/group5/app/model/organization/Organization.java new file mode 100644 index 0000000..825945f --- /dev/null +++ b/src/main/java/edu/group5/app/model/organization/Organization.java @@ -0,0 +1,5 @@ +package edu.group5.app.model.organization; + +public class Organization { + +} diff --git a/src/main/java/edu/group5/app/model/user/User.java b/src/main/java/edu/group5/app/model/user/User.java new file mode 100644 index 0000000..e163785 --- /dev/null +++ b/src/main/java/edu/group5/app/model/user/User.java @@ -0,0 +1,5 @@ +package edu.group5.app.model.user; + +public class User { + +} diff --git a/src/main/java/edu/group5/app/utils/Utilities.java b/src/main/java/edu/group5/app/utils/Utilities.java new file mode 100644 index 0000000..ce21d22 --- /dev/null +++ b/src/main/java/edu/group5/app/utils/Utilities.java @@ -0,0 +1,5 @@ +package edu.group5.app.utils; + +public class Utilities { + +} diff --git a/src/main/java/edu/group5/app/view/View.java b/src/main/java/edu/group5/app/view/View.java new file mode 100644 index 0000000..2c36e4f --- /dev/null +++ b/src/main/java/edu/group5/app/view/View.java @@ -0,0 +1,5 @@ +package edu.group5.app.view; + +public class View { + +} diff --git a/target/Help-Me-Help-1.0-SNAPSHOT.jar b/target/Help-Me-Help-1.0-SNAPSHOT.jar deleted file mode 100644 index 566599b..0000000 Binary files a/target/Help-Me-Help-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/target/classes/edu/group5/app/App.class b/target/classes/edu/group5/app/App.class index c24ab27..e3679e1 100644 Binary files a/target/classes/edu/group5/app/App.class and b/target/classes/edu/group5/app/App.class differ diff --git a/target/classes/edu/group5/app/control/Wrapper.class b/target/classes/edu/group5/app/control/Wrapper.class new file mode 100644 index 0000000..cbe1488 Binary files /dev/null and b/target/classes/edu/group5/app/control/Wrapper.class differ diff --git a/target/classes/edu/group5/app/model/donation/Donation.class b/target/classes/edu/group5/app/model/donation/Donation.class new file mode 100644 index 0000000..687d00e Binary files /dev/null and b/target/classes/edu/group5/app/model/donation/Donation.class differ diff --git a/target/classes/edu/group5/app/model/organization/Organization.class b/target/classes/edu/group5/app/model/organization/Organization.class new file mode 100644 index 0000000..af118dd Binary files /dev/null and b/target/classes/edu/group5/app/model/organization/Organization.class differ diff --git a/target/classes/edu/group5/app/model/user/User.class b/target/classes/edu/group5/app/model/user/User.class new file mode 100644 index 0000000..950b2f7 Binary files /dev/null and b/target/classes/edu/group5/app/model/user/User.class differ diff --git a/target/classes/edu/group5/app/utils/Utilities.class b/target/classes/edu/group5/app/utils/Utilities.class new file mode 100644 index 0000000..9fb7579 Binary files /dev/null and b/target/classes/edu/group5/app/utils/Utilities.class differ diff --git a/target/classes/edu/group5/app/view/View.class b/target/classes/edu/group5/app/view/View.class new file mode 100644 index 0000000..bc21f75 Binary files /dev/null and b/target/classes/edu/group5/app/view/View.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index 4eb27f1..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=Help-Me-Help -groupId=edu.group5.app -version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 044dac8..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -edu\group5\app\AppTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index 63aa853..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -C:\Users\marjo\Documents\Github\Help-Me-Help\src\test\java\edu\group5\app\AppTest.java diff --git a/target/surefire-reports/TEST-edu.group5.app.AppTest.xml b/target/surefire-reports/TEST-edu.group5.app.AppTest.xml deleted file mode 100644 index 05989b0..0000000 --- a/target/surefire-reports/TEST-edu.group5.app.AppTest.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/surefire-reports/edu.group5.app.AppTest.txt b/target/surefire-reports/edu.group5.app.AppTest.txt deleted file mode 100644 index 92fe711..0000000 --- a/target/surefire-reports/edu.group5.app.AppTest.txt +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------------------- -Test set: edu.group5.app.AppTest -------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 s -- in edu.group5.app.AppTest diff --git a/target/test-classes/edu/group5/app/AppTest.class b/target/test-classes/edu/group5/app/AppTest.class index 7f3006a..4c66499 100644 Binary files a/target/test-classes/edu/group5/app/AppTest.class and b/target/test-classes/edu/group5/app/AppTest.class differ