From 62b7ed798929fbef39ac6fe947cdc2f49129b28e Mon Sep 17 00:00:00 2001 From: Edson Yoshimaru Date: Sat, 7 May 2022 22:54:49 +0900 Subject: [PATCH] Changed to maven project --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 67 +- .idea/ShopOOP.iml | 12 - .idea/dataSources.local.xml | 10 - .idea/dataSources.xml | 30 - .../0a2e2e62-2793-4dea-9089-c8e7d51d983f.xml | 307 ----- .../storage_v2/_src_/schema/main.uQUzAA.meta | 2 - .../storage_v2/_src_/schema/main.uQUzAA.meta | 2 - .../org_xerial_sqlite_jdbc_3_8_11_1.xml | 10 - .idea/misc.xml | 6 - .idea/modules.xml | 8 - .idea/sqldialects.xml | 6 - .idea/uiDesigner.xml | 124 -- .idea/vcs.xml | 6 - .idea/workspace.xml | 1032 ----------------- ShopOOP.iml | 13 - {src/data => data}/ShopDB.sqlite | Bin pom.xml | 85 ++ .../AddEditCustomerController.java | 18 +- .../controllers/CustomerBasketController.java | 28 +- .../controllers/CustomerHomeController.java | 14 +- .../controllers/CustomerLoginController.java | 4 +- .../controllers/EditProductsController.java | 18 +- .../java}/controllers/MainMenuController.java | 4 +- .../controllers/StaffHomeController.java | 4 +- .../controllers/StaffLoginController.java | 4 +- src/{ => main/java}/controllers/Start.java | 0 .../controllers/ViewOrderLinesController.java | 20 +- .../controllers/ViewOrdersController.java | 20 +- .../controllers/ViewProductsController.java | 40 +- src/{ => main/java}/data/ShopContract.java | 0 src/{ => main/java}/models/Clothing.java | 0 src/{ => main/java}/models/Customer.java | 0 src/{ => main/java}/models/Footwear.java | 0 src/{ => main/java}/models/Order.java | 0 src/{ => main/java}/models/OrderLine.java | 0 src/{ => main/java}/models/Product.java | 0 src/{ => main/java}/models/Staff.java | 0 src/{ => main/java}/models/User.java | 0 src/{ => main/java}/service/AlertService.java | 4 +- src/main/java/service/ControllerService.java | 19 + src/{ => main/java}/service/DbManager.java | 4 +- .../java}/service/LabelStatusService.java | 0 src/{ => main/java}/service/LoginService.java | 10 +- src/{ => main/java}/service/ProductList.java | 6 +- src/{ => main/java}/service/StageService.java | 27 +- .../java}/validation/LoginTextField.java | 0 .../java}/validation/LoginValidation.java | 0 .../java}/validation/NumberTextField.java | 0 .../java}/validation/PriceTextField.java | 0 .../java}/validation/ProductValidation.java | 0 .../java}/validation/RegisterValidation.java | 0 .../controllers}/add_edit_customer.fxml | 0 .../controllers}/customer_basket.fxml | 0 .../resources/controllers}/customer_home.fxml | 0 .../controllers}/customer_login.fxml | 0 .../resources/controllers}/edit_products.fxml | 0 .../resources/controllers}/main_menu.fxml | 2 +- .../resources/controllers}/staff_home.fxml | 0 .../resources/controllers}/staff_login.fxml | 0 .../controllers}/view_order_lines.fxml | 0 .../resources/controllers}/view_orders.fxml | 0 .../resources/controllers}/view_products.fxml | 0 .../resources}/images/store.png | Bin src/service/ControllerService.java | 19 - 65 files changed, 302 insertions(+), 1683 deletions(-) delete mode 100644 .DS_Store delete mode 100644 .idea/ShopOOP.iml delete mode 100644 .idea/dataSources.local.xml delete mode 100644 .idea/dataSources.xml delete mode 100644 .idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f.xml delete mode 100644 .idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f/storage_v2/_src_/schema/main.uQUzAA.meta delete mode 100644 .idea/dataSources/40e3d608-bf70-4948-9480-d7c30974289e/storage_v2/_src_/schema/main.uQUzAA.meta delete mode 100644 .idea/libraries/org_xerial_sqlite_jdbc_3_8_11_1.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/sqldialects.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml delete mode 100644 ShopOOP.iml rename {src/data => data}/ShopDB.sqlite (100%) create mode 100644 pom.xml rename src/{ => main/java}/controllers/AddEditCustomerController.java (97%) rename src/{ => main/java}/controllers/CustomerBasketController.java (96%) rename src/{ => main/java}/controllers/CustomerHomeController.java (100%) rename src/{ => main/java}/controllers/CustomerLoginController.java (100%) rename src/{ => main/java}/controllers/EditProductsController.java (97%) rename src/{ => main/java}/controllers/MainMenuController.java (100%) rename src/{ => main/java}/controllers/StaffHomeController.java (100%) rename src/{ => main/java}/controllers/StaffLoginController.java (100%) rename src/{ => main/java}/controllers/Start.java (100%) rename src/{ => main/java}/controllers/ViewOrderLinesController.java (97%) rename src/{ => main/java}/controllers/ViewOrdersController.java (100%) rename src/{ => main/java}/controllers/ViewProductsController.java (95%) rename src/{ => main/java}/data/ShopContract.java (100%) rename src/{ => main/java}/models/Clothing.java (100%) rename src/{ => main/java}/models/Customer.java (100%) rename src/{ => main/java}/models/Footwear.java (100%) rename src/{ => main/java}/models/Order.java (100%) rename src/{ => main/java}/models/OrderLine.java (100%) rename src/{ => main/java}/models/Product.java (100%) rename src/{ => main/java}/models/Staff.java (100%) rename src/{ => main/java}/models/User.java (100%) rename src/{ => main/java}/service/AlertService.java (100%) create mode 100644 src/main/java/service/ControllerService.java rename src/{ => main/java}/service/DbManager.java (90%) rename src/{ => main/java}/service/LabelStatusService.java (100%) rename src/{ => main/java}/service/LoginService.java (100%) rename src/{ => main/java}/service/ProductList.java (100%) rename src/{ => main/java}/service/StageService.java (93%) rename src/{ => main/java}/validation/LoginTextField.java (100%) rename src/{ => main/java}/validation/LoginValidation.java (100%) rename src/{ => main/java}/validation/NumberTextField.java (100%) rename src/{ => main/java}/validation/PriceTextField.java (100%) rename src/{ => main/java}/validation/ProductValidation.java (100%) rename src/{ => main/java}/validation/RegisterValidation.java (100%) rename src/{views => main/resources/controllers}/add_edit_customer.fxml (100%) rename src/{views => main/resources/controllers}/customer_basket.fxml (100%) rename src/{views => main/resources/controllers}/customer_home.fxml (100%) rename src/{views => main/resources/controllers}/customer_login.fxml (100%) rename src/{views => main/resources/controllers}/edit_products.fxml (100%) rename src/{views => main/resources/controllers}/main_menu.fxml (97%) rename src/{views => main/resources/controllers}/staff_home.fxml (100%) rename src/{views => main/resources/controllers}/staff_login.fxml (100%) rename src/{views => main/resources/controllers}/view_order_lines.fxml (100%) rename src/{views => main/resources/controllers}/view_orders.fxml (100%) rename src/{views => main/resources/controllers}/view_products.fxml (100%) rename src/{views => main/resources}/images/store.png (100%) delete mode 100644 src/service/ControllerService.java diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index bdfd9dbfcfbc66d21ffb346083acf9a8d7f50cc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-~a+7@mQuyCAZBl#l3PV`E|hhZ2bBfv_$ZtsJNw{P8Vyl2sKq>IIDZswnUKFDUmAuB;?>F${ zB%A$+dwNrsE??0!tzR3^cAW#-a1uAE$F>`7vsT_s4m|0vQyTp6U2nrDjiNESM8m}O zLlW_1zf6F#v+0Lr+OTOoEXRBtM|9}AuIWW%qS>6CzdLQtW$(47&F1`k7W~;et(LBh z-no<^2@9H`!PuhMPo27MKlQVH1-pphFfQPw{~JsJeQDaF5IUu z;~^-#T4S_$gG4c4SAJp3jUqR!5c_C1a6J;NhBi$ST4hW&8Z0Cq5jGN^$*H*|KdfXH zzX}aAR=(rh7LI{3!hvJK!0Vw~CAyxmR%B2^Q|LZ=j2v`;8t4@|L2uAI^d5aeU(h$4 z!ejU*p2Bl@0Wac5IEPno9zVfrBD<&aB5!o25Qw({<%>LYqA;Lg1tJ~xd9rFPeuf#u9t-cT@~9mY2~9brqLs+9stf%6Kme}6E8o&OJhfB)ws zRVf9O0{^B0IJN97+psoywsx(OowX*EJt)i=uPu - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml deleted file mode 100644 index d928e47..0000000 --- a/.idea/dataSources.local.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - *:main - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index 021939c..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - sqlite.xerial - true - true - SQLite - org.sqlite.JDBC - jdbc:sqlite:$PROJECT_DIR$/src/data/ShopDB.sqlite - - - - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.16.1/xerial-sqlite-license.txt - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.16.1/sqlite-jdbc-3.16.1.jar - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.16.1/sqlite-jdbc-3.16.1.jar - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.16.1/xerial-sqlite-license.txt - - - - - \ No newline at end of file diff --git a/.idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f.xml b/.idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f.xml deleted file mode 100644 index 2ad4ee4..0000000 --- a/.idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f.xml +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - 1 - 1 - - - - - -
-
-
-
-
- 1 -
- - 1 -
- - 1 - TEXT|0 - NOCASE - - - 2 - TEXT|0 - NOCASE - - - 3 - TEXT|0 - NOCASE - - - 4 - TEXT|0 - NOCASE - - - 5 - TEXT|0 - NOCASE - - - 6 - TEXT|0 - NOCASE - - - 7 - TEXT|0 - NOCASE - - - 8 - TEXT|0 - NOCASE - - - Username - - 1 - - - 1 - Username - - 1 - - - Postcode - - - - Username - 1 - sqlite_autoindex_Customers_1 - - - Username - sqlite_autoindex_Customers_1 - - - 1 - INTEGER|0 - 1 - - - 2 - INTEGER|0 - - - 3 - INTEGER|0 - - - 4 - REAL|0 - - - 5 - INTEGER|0 - - - 'OrderLineId' - - 1 - - - 1 - OrderLineId - - 1 - - - 'OrderId' - - - - 'ProductId' - - - - OrderLineId - 1 - sqlite_autoindex_OrderLines_1 - - - OrderLineId - sqlite_autoindex_OrderLines_1 - - - 1 - INTEGER|0 - 1 - - - 2 - NUMERIC|0 - - - 3 - TEXT|0 - NOCASE - - - 4 - REAL|0 - - - 5 - TEXT|0 - NOCASE - - - OrderId - - 1 - - - 1 - OrderId - - 1 - - - Username - - - - OrderId - 1 - sqlite_autoindex_Orders_1 - - - OrderId - sqlite_autoindex_Orders_1 - - - 1 - INTEGER|0 - 1 - - - 2 - TEXT|0 - NOCASE - - - 3 - REAL|0 - - - 4 - INTEGER|0 - - - 5 - TEXT|0 - NULL - - - 6 - INTEGER|0 - NULL - - - ProductId - - 1 - - - 1 - ProductId - - 1 - - - ProductId - 1 - sqlite_autoindex_Products_1 - - - ProductId - sqlite_autoindex_Products_1 - - - 1 - TEXT|0 - NOCASE - - - 2 - TEXT|0 - NOCASE - - - 3 - TEXT|0 - NOCASE - - - 4 - TEXT|0 - NOCASE - - - 5 - TEXT|0 - NOCASE - - - 6 - REAL|0 - - - Username - - 1 - - - 1 - Username - - 1 - - - Username - 1 - sqlite_autoindex_Staff_1 - - - Username - sqlite_autoindex_Staff_1 - - - 1 - text|0 - - - 2 - text|0 - - - 3 - text|0 - - - 4 - integer|0 - - - 5 - text|0 - - - 1 - - - 2 - - - \ No newline at end of file diff --git a/.idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f/storage_v2/_src_/schema/main.uQUzAA.meta b/.idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f/storage_v2/_src_/schema/main.uQUzAA.meta deleted file mode 100644 index 8dab49c..0000000 --- a/.idea/dataSources/0a2e2e62-2793-4dea-9089-c8e7d51d983f/storage_v2/_src_/schema/main.uQUzAA.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:main -! [0, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/40e3d608-bf70-4948-9480-d7c30974289e/storage_v2/_src_/schema/main.uQUzAA.meta b/.idea/dataSources/40e3d608-bf70-4948-9480-d7c30974289e/storage_v2/_src_/schema/main.uQUzAA.meta deleted file mode 100644 index 8dab49c..0000000 --- a/.idea/dataSources/40e3d608-bf70-4948-9480-d7c30974289e/storage_v2/_src_/schema/main.uQUzAA.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:main -! [0, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/libraries/org_xerial_sqlite_jdbc_3_8_11_1.xml b/.idea/libraries/org_xerial_sqlite_jdbc_3_8_11_1.xml deleted file mode 100644 index 6b3f1d4..0000000 --- a/.idea/libraries/org_xerial_sqlite_jdbc_3_8_11_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index bdc94d8..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index a8c229e..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index c0e01ca..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 6e1d590..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,1032 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - GeneralJava - - - Java - - - Kotlin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -