diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index bdfd9db..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 6143e53..caf72de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,63 @@ -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/* +/mvnw.cmd +/mvnw # Package Files # *.jar *.war +*.nar *.ear *.zip *.tar.gz *.rar -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### Eclipse ### +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ +/.java-version diff --git a/.idea/ShopOOP.iml b/.idea/ShopOOP.iml deleted file mode 100644 index 8f7ae1a..0000000 --- a/.idea/ShopOOP.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -