diff --git a/build.gradle b/build.gradle index ef169e9..9ed620e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,8 +23,7 @@ java { } application { - mainClass = 'lodge.TestReservations' - applicationDefaultJvmArgs = ["--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED"] + mainClass = 'lodge.TestMainFx' } sourceSets { @@ -50,7 +49,8 @@ repositories { } javafx { - modules = [ 'javafx.controls', 'javafx.fxml' ] + version = "24" + modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.web' ] } dependencies { @@ -62,20 +62,23 @@ dependencies { implementation 'org.openjfx:javafx-controls:24.0.1' implementation 'org.openjfx:javafx-graphics:24.0.1' implementation 'org.openjfx:javafx-web:24.0.1' - + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17' + implementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.17' } jar { manifest { attributes 'Main-Class': application.mainClass } + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } } tasks.named('jar') { manifest { attributes('Implementation-Title': 'lodge.reservationsystem', 'Implementation-Version': 1.0, - 'Main-Class': 'lodge.TestReservations', - 'Class-Path': 'lodge.reservationsystem com.google.gson .' ) + 'Main-Class': application.mainClass, + 'Class-Path': 'lodge.reservationsystem javafx.base javafx.fxml javafx.controls javafx.graphics javafx.web com.google.gson .' ) } } diff --git a/libs/error_prone_annotations-2.41.0.jar b/libs/error_prone_annotations-2.41.0.jar deleted file mode 100644 index 4ef60ab..0000000 Binary files a/libs/error_prone_annotations-2.41.0.jar and /dev/null differ diff --git a/libs/gson-2.13.2.jar b/libs/gson-2.13.2.jar deleted file mode 100644 index 5a1b74e..0000000 Binary files a/libs/gson-2.13.2.jar and /dev/null differ diff --git a/libs/javafx-base-24.0.1.jar b/libs/javafx-base-24.0.1.jar deleted file mode 100644 index 4902458..0000000 Binary files a/libs/javafx-base-24.0.1.jar and /dev/null differ diff --git a/libs/javafx-controls-24.0.1.jar b/libs/javafx-controls-24.0.1.jar deleted file mode 100644 index 42ccba3..0000000 Binary files a/libs/javafx-controls-24.0.1.jar and /dev/null differ diff --git a/libs/javafx-fxml-24.0.1.jar b/libs/javafx-fxml-24.0.1.jar deleted file mode 100644 index f92c2d3..0000000 Binary files a/libs/javafx-fxml-24.0.1.jar and /dev/null differ diff --git a/libs/javafx-graphics-24.0.1.jar b/libs/javafx-graphics-24.0.1.jar deleted file mode 100644 index 8e95a08..0000000 Binary files a/libs/javafx-graphics-24.0.1.jar and /dev/null differ diff --git a/libs/javafx-media-24.0.1.jar b/libs/javafx-media-24.0.1.jar deleted file mode 100644 index 686f8f5..0000000 Binary files a/libs/javafx-media-24.0.1.jar and /dev/null differ diff --git a/libs/javafx-web-24.0.1.jar b/libs/javafx-web-24.0.1.jar deleted file mode 100644 index 2dddf04..0000000 Binary files a/libs/javafx-web-24.0.1.jar and /dev/null differ diff --git a/src/resources/db/acc-A07421233.json b/src/resources/db/acc-A07421233.json index 2ec96d1..a8b7844 100644 --- a/src/resources/db/acc-A07421233.json +++ b/src/resources/db/acc-A07421233.json @@ -1 +1 @@ -{ "Account":{"account_number": "A07421233","phone_number": "301-356-3890","mailing_address": { "Address":{"street": "30 Amstadam ave","city": "New York","state": "NY","zip": "12010"}},"email_address": { "EmailAddress":{"email": "newbee952@aol.com"}},"reservations":[{"HotelReservation":{"reservation_number":"R0123087344"}},{"CabinReservation":{"reservation_number":"R2042828431"}}]}} \ No newline at end of file +{ "Account":{"account_number": "A07421233","phone_number": "301-356-3890","mailing_address": { "Address":{"street": "30 Amstadam ave","city": "New York","state": "NY","zip": "12010"}},"email_address": { "EmailAddress":{"email": "newbee952@aol.com"}},"reservations":[{"HotelReservation":{"reservation_number":"R0123087344"}},{"CabinReservation":{"reservation_number":"R2042828431"}},{"CabinReservation":{"reservation_number":"R0535276622"}},{"HouseReservation":{"reservation_number":"R0499811708"}}]}} \ No newline at end of file diff --git a/src/resources/db/acc-A45098176.json b/src/resources/db/acc-A45098176.json index 3438597..7c1852f 100644 --- a/src/resources/db/acc-A45098176.json +++ b/src/resources/db/acc-A45098176.json @@ -1 +1 @@ -{ "Account":{"account_number": "A45098176","phone_number": "701-456-7890","mailing_address": { "Address":{"street": "10 wilco ave","city": "wilco","state": "WY","zip": "82801"}},"email_address": { "EmailAddress":{"email": "wilco@wyommin.net"}},"reservations":[]}} \ No newline at end of file +{ "Account":{"account_number": "A45098176","phone_number": "701-456-7890","mailing_address": { "Address":{"street": "10 wilco ave","city": "wilco","state": "WY","zip": "82801"}},"email_address": { "EmailAddress":{"email": "wilco@wyommin.net"}},"reservations":[{"HotelReservation":{"reservation_number":"R0123087344"}},{"CabinReservation":{"reservation_number":"R2042828431"}}]}} \ No newline at end of file diff --git a/src/resources/db/res-R0123087344.json b/src/resources/db/res-R0123087344.json index 9c02269..f119953 100644 --- a/src/resources/db/res-R0123087344.json +++ b/src/resources/db/res-R0123087344.json @@ -1 +1 @@ -{ "HotelReservation":{"reservation_type": "HotelReservation","reservation_number": "R0123087344","reservation_status": "Canceled","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A07421233","physical_address": { "Address":{"street": "400 hotel ave","city": "Maryland City","state": "MD","zip": "20723"}},"mailing_address": { "Address":{"street": "400 hotel ave","city": "Maryland City","state": "MD","zip": "20723"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "410.0"}} \ No newline at end of file +{ "HotelReservation":{"reservation_type": "HotelReservation","reservation_number": "R0123087344","reservation_status": "Canceled","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A45098176","physical_address": { "Address":{"street": "400 hotel ave","city": "Maryland City","state": "MD","zip": "20723"}},"mailing_address": { "Address":{"street": "400 hotel ave","city": "Maryland City","state": "MD","zip": "20723"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "410.0"}} \ No newline at end of file diff --git a/src/resources/db/res-R0499811708.json b/src/resources/db/res-R0499811708.json index 134077c..3683842 100644 --- a/src/resources/db/res-R0499811708.json +++ b/src/resources/db/res-R0499811708.json @@ -1 +1 @@ -{ "HouseReservation":{"reservation_type": "HouseReservation","reservation_number": "R0499811708","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A45098176","physical_address": { "Address":{"street": "3000 Osage ave","city": "GreenBelt","state": "MD","zip": "20740"}},"mailing_address": { "Address":{"street": "40012 College ave","city": "College Park","state": "MD","zip": "20740"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file +{ "HouseReservation":{"reservation_type": "HouseReservation","reservation_number": "R0499811708","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A07421233","physical_address": { "Address":{"street": "3000 Osage ave","city": "GreenBelt","state": "MD","zip": "20740"}},"mailing_address": { "Address":{"street": "40012 College ave","city": "College Park","state": "MD","zip": "20740"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file diff --git a/src/resources/db/res-R0535276622.json b/src/resources/db/res-R0535276622.json index 2f1f457..ac34c3e 100644 --- a/src/resources/db/res-R0535276622.json +++ b/src/resources/db/res-R0535276622.json @@ -1 +1 @@ -{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R0535276622","reservation_status": "Completed","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A45098176","physical_address": { "Address":{"street": "40 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "40 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file +{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R0535276622","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A07421233","physical_address": { "Address":{"street": "40 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "40 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file diff --git a/src/resources/db/res-R2042828431.json b/src/resources/db/res-R2042828431.json index 70e76e8..c0c471b 100644 --- a/src/resources/db/res-R2042828431.json +++ b/src/resources/db/res-R2042828431.json @@ -1 +1 @@ -{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R2042828431","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A07421233","physical_address": { "Address":{"street": "30 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "30 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file +{ "CabinReservation":{"reservation_type": "CabinReservation","reservation_number": "R2042828431","reservation_status": "Draft","reservation_start_date": "2025-09-05T10:00Z[UTC]","reservation_end_date": "2025-09-09T10:00Z[UTC]","account_number": "A45098176","physical_address": { "Address":{"street": "30 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}},"mailing_address": { "Address":{"street": "30 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}},"kitchen": "Kitchenette","numberOfBeds": "2","numberOfBedRooms": "1","numberOfBathRooms": "1","numberOfFloors": "1","squareFeet": "450","price": "360.0"}} \ No newline at end of file