diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 9ad367c..3dbf59e 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -4,6 +4,7 @@ on:
push:
branches:
- main
+ - release/*
workflow_dispatch: # Allows manual triggering of the workflow
@@ -33,16 +34,6 @@ jobs:
java-version: '25'
- name: Run Tests
run: mvn clean test
- - name: Upload Test Results
- uses: actions/upload-artifact@v3
- with:
- name: surefire-reports
- path: target/surefire-reports/
- - name: Upload Coverage Report
- uses: actions/upload-artifact@v3
- with:
- name: jacoco-report
- path: target/jacoco/coverage-reports/jacoco.xml
package:
name: Package
@@ -62,15 +53,4 @@ jobs:
name: packaged-app
path: target/Help-Me-Help-1.0-SNAPSHOT-jar-with-dependencies.jar
- deployPages:
- environment:
- name: github-pages
- url: ${{ steps.deployment.outputs.page_url }}
- runs-on: self-hosted
- steps:
- - uses: actions/checkout@v3
- - name: Set up JDK
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: '25'
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..48a9ee7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,45 @@
+##############################
+## Java
+##############################
+.mtj.tmp/
+*.class
+*.jar
+*.war
+*.ear
+*.nar
+target/
+
+##############################
+## 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
+
+##############################
+## VSCode
+##############################
+.vscode/
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index dc3b895..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "java.configuration.updateBuildConfiguration": "interactive"
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4d088c4..1873d07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
javafx-controls
${javafx.version}
+<<<<<<< HEAD
@@ -39,6 +40,8 @@
spring-security-crypto
7.0.2
+=======
+>>>>>>> main
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
deleted file mode 100644
index e3679e1..0000000
Binary files a/target/classes/edu/group5/app/App.class and /dev/null 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/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 28e9804..0000000
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-edu\group5\app\App.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 16a5464..0000000
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-C:\Users\marjo\Documents\Github\Help-Me-Help\src\main\java\edu\group5\app\App.java
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
deleted file mode 100644
index 4c66499..0000000
Binary files a/target/test-classes/edu/group5/app/AppTest.class and /dev/null differ