gotova manager appl

komadiina · Jan 30, 2025 · e4e6ee2 · e4e6ee2
1 parent 4fcebde
commit e4e6ee2
Show file tree

Hide file tree

Showing 187 changed files with 1,983 additions and 45 deletions.
diff --git a/promotionapp/.gitignore → client-app/.gitignore b/promotionapp/.gitignore → client-app/.gitignore
diff --git a/promotionapp/.idea/.gitignore → client-app/.idea/.gitignore b/promotionapp/.idea/.gitignore → client-app/.idea/.gitignore
diff --git a/promotionapp/.idea/encodings.xml → client-app/.idea/encodings.xml b/promotionapp/.idea/encodings.xml → client-app/.idea/encodings.xml
diff --git a/promotionapp/.idea/jsLibraryMappings.xml → client-app/.idea/jsLibraryMappings.xml b/promotionapp/.idea/jsLibraryMappings.xml → client-app/.idea/jsLibraryMappings.xml
diff --git a/promotionapp/.idea/misc.xml → client-app/.idea/misc.xml b/promotionapp/.idea/misc.xml → client-app/.idea/misc.xml
diff --git a/promotionapp/.idea/uiDesigner.xml → client-app/.idea/uiDesigner.xml b/promotionapp/.idea/uiDesigner.xml → client-app/.idea/uiDesigner.xml
diff --git a/client-app/.idea/vcs.xml b/client-app/.idea/vcs.xml
diff --git a/promotionapp/.mvn/wrapper/maven-wrapper.jar → client-app/.mvn/wrapper/maven-wrapper.jar b/promotionapp/.mvn/wrapper/maven-wrapper.jar → client-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/...app/.mvn/wrapper/maven-wrapper.properties → ...app/.mvn/wrapper/maven-wrapper.properties b/...app/.mvn/wrapper/maven-wrapper.properties → ...app/.mvn/wrapper/maven-wrapper.properties
diff --git a/promotionapp/mvnw → client-app/mvnw b/promotionapp/mvnw → client-app/mvnw
diff --git a/promotionapp/mvnw.cmd → client-app/mvnw.cmd b/promotionapp/mvnw.cmd → client-app/mvnw.cmd
diff --git a/promotionapp/pom.xml → client-app/pom.xml b/promotionapp/pom.xml → client-app/pom.xml
diff --git a/...ibl/etf/promotionapp/beans/LoginBean.java → ...ibl/etf/promotionapp/beans/LoginBean.java b/...ibl/etf/promotionapp/beans/LoginBean.java → ...ibl/etf/promotionapp/beans/LoginBean.java
diff --git a/...l/etf/promotionapp/beans/MessageBean.java → ...l/etf/promotionapp/beans/MessageBean.java b/...l/etf/promotionapp/beans/MessageBean.java → ...l/etf/promotionapp/beans/MessageBean.java
diff --git a/...bl/etf/promotionapp/beans/RentalInfo.java → ...bl/etf/promotionapp/beans/RentalInfo.java b/...bl/etf/promotionapp/beans/RentalInfo.java → ...bl/etf/promotionapp/beans/RentalInfo.java
diff --git a/...onapp/beans/TransportationDeviceBean.java → ...onapp/beans/TransportationDeviceBean.java b/...onapp/beans/TransportationDeviceBean.java → ...onapp/beans/TransportationDeviceBean.java
diff --git a/...nibl/etf/promotionapp/beans/UserBean.java → ...nibl/etf/promotionapp/beans/UserBean.java b/...nibl/etf/promotionapp/beans/UserBean.java → ...nibl/etf/promotionapp/beans/UserBean.java
diff --git a/...ecated/repositories/ClientRepository.java → ...ecated/repositories/ClientRepository.java b/...ecated/repositories/ClientRepository.java → ...ecated/repositories/ClientRepository.java
diff --git a/...positories/ElectricBicycleRepository.java → ...positories/ElectricBicycleRepository.java b/...positories/ElectricBicycleRepository.java → ...positories/ElectricBicycleRepository.java
diff --git a/...positories/ElectricScooterRepository.java → ...positories/ElectricScooterRepository.java b/...positories/ElectricScooterRepository.java → ...positories/ElectricScooterRepository.java
diff --git a/...cated/repositories/GenericRepository.java → ...cated/repositories/GenericRepository.java b/...cated/repositories/GenericRepository.java → ...cated/repositories/GenericRepository.java
diff --git a/...d/repositories/GenericRepositoryImpl.java → ...d/repositories/GenericRepositoryImpl.java b/...d/repositories/GenericRepositoryImpl.java → ...d/repositories/GenericRepositoryImpl.java
diff --git a/...d/repositories/RentalPriceRepository.java → ...d/repositories/RentalPriceRepository.java b/...d/repositories/RentalPriceRepository.java → ...d/repositories/RentalPriceRepository.java
diff --git a/...ecated/repositories/RentalRepository.java → ...ecated/repositories/RentalRepository.java b/...ecated/repositories/RentalRepository.java → ...ecated/repositories/RentalRepository.java
diff --git a/...ories/TransportationDeviceRepository.java → ...ories/TransportationDeviceRepository.java b/...ories/TransportationDeviceRepository.java → ...ories/TransportationDeviceRepository.java
diff --git a/...precated/repositories/UserRepository.java → ...precated/repositories/UserRepository.java b/...precated/repositories/UserRepository.java → ...precated/repositories/UserRepository.java
diff --git a/...cated/repositories/VehicleRepository.java → ...cated/repositories/VehicleRepository.java b/...cated/repositories/VehicleRepository.java → ...cated/repositories/VehicleRepository.java
diff --git a/...bl/etf/promotionapp/db/models/Client.java → ...bl/etf/promotionapp/db/models/Client.java b/...bl/etf/promotionapp/db/models/Client.java → ...bl/etf/promotionapp/db/models/Client.java
diff --git a/...omotionapp/db/models/ElectricBicycle.java → ...omotionapp/db/models/ElectricBicycle.java b/...omotionapp/db/models/ElectricBicycle.java → ...omotionapp/db/models/ElectricBicycle.java
diff --git a/...omotionapp/db/models/ElectricScooter.java → ...omotionapp/db/models/ElectricScooter.java b/...omotionapp/db/models/ElectricScooter.java → ...omotionapp/db/models/ElectricScooter.java
diff --git a/...bl/etf/promotionapp/db/models/Rental.java → ...bl/etf/promotionapp/db/models/Rental.java b/...bl/etf/promotionapp/db/models/Rental.java → ...bl/etf/promotionapp/db/models/Rental.java
diff --git a/...f/promotionapp/db/models/RentalPrice.java → ...f/promotionapp/db/models/RentalPrice.java b/...f/promotionapp/db/models/RentalPrice.java → ...f/promotionapp/db/models/RentalPrice.java
diff --git a/...onapp/db/models/TransportationDevice.java → ...onapp/db/models/TransportationDevice.java b/...onapp/db/models/TransportationDevice.java → ...onapp/db/models/TransportationDevice.java
diff --git a/...nibl/etf/promotionapp/db/models/User.java → ...nibl/etf/promotionapp/db/models/User.java b/...nibl/etf/promotionapp/db/models/User.java → ...nibl/etf/promotionapp/db/models/User.java
diff --git a/...l/etf/promotionapp/db/models/Vehicle.java → ...l/etf/promotionapp/db/models/Vehicle.java b/...l/etf/promotionapp/db/models/Vehicle.java → ...l/etf/promotionapp/db/models/Vehicle.java
diff --git a/...omotionapp/db/mysql/ClientRepository.java → ...omotionapp/db/mysql/ClientRepository.java b/...omotionapp/db/mysql/ClientRepository.java → ...omotionapp/db/mysql/ClientRepository.java
diff --git a/...onapp/db/mysql/RentalPriceRepository.java → ...onapp/db/mysql/RentalPriceRepository.java b/...onapp/db/mysql/RentalPriceRepository.java → ...onapp/db/mysql/RentalPriceRepository.java
diff --git a/...omotionapp/db/mysql/RentalRepository.java → ...omotionapp/db/mysql/RentalRepository.java b/...omotionapp/db/mysql/RentalRepository.java → ...omotionapp/db/mysql/RentalRepository.java
diff --git a/...mysql/TransportationDeviceRepository.java → ...mysql/TransportationDeviceRepository.java b/...mysql/TransportationDeviceRepository.java → ...mysql/TransportationDeviceRepository.java
diff --git a/...promotionapp/db/services/AuthService.java → ...promotionapp/db/services/AuthService.java b/...promotionapp/db/services/AuthService.java → ...promotionapp/db/services/AuthService.java
diff --git a/.../promotionapp/db/services/PDFService.java → .../promotionapp/db/services/PDFService.java b/.../promotionapp/db/services/PDFService.java → .../promotionapp/db/services/PDFService.java
diff --git a/...omotionapp/db/services/RentalService.java → ...omotionapp/db/services/RentalService.java b/...omotionapp/db/services/RentalService.java → ...omotionapp/db/services/RentalService.java
diff --git a/...unibl/etf/promotionapp/rest/RESTUtil.java → ...unibl/etf/promotionapp/rest/RESTUtil.java b/...unibl/etf/promotionapp/rest/RESTUtil.java → ...unibl/etf/promotionapp/rest/RESTUtil.java
diff --git a/...omotionapp/servlets/DashboardServlet.java → ...omotionapp/servlets/DashboardServlet.java b/...omotionapp/servlets/DashboardServlet.java → ...omotionapp/servlets/DashboardServlet.java
diff --git a/...motionapp/servlets/DashboardServlet.java~ → ...motionapp/servlets/DashboardServlet.java~ b/...motionapp/servlets/DashboardServlet.java~ → ...motionapp/servlets/DashboardServlet.java~
diff --git a/...f/promotionapp/servlets/LoginServlet.java → ...f/promotionapp/servlets/LoginServlet.java b/...f/promotionapp/servlets/LoginServlet.java → ...f/promotionapp/servlets/LoginServlet.java
diff --git a/...promotionapp/servlets/ProfileServlet.java → ...promotionapp/servlets/ProfileServlet.java b/...promotionapp/servlets/ProfileServlet.java → ...promotionapp/servlets/ProfileServlet.java
diff --git a/...romotionapp/servlets/RegisterServlet.java → ...romotionapp/servlets/RegisterServlet.java b/...romotionapp/servlets/RegisterServlet.java → ...romotionapp/servlets/RegisterServlet.java
diff --git a/...motionapp/servlets/RentalBikeServlet.java → ...motionapp/servlets/RentalBikeServlet.java b/...motionapp/servlets/RentalBikeServlet.java → ...motionapp/servlets/RentalBikeServlet.java
diff --git a/...omotionapp/servlets/RentalCarServlet.java → ...omotionapp/servlets/RentalCarServlet.java b/...omotionapp/servlets/RentalCarServlet.java → ...omotionapp/servlets/RentalCarServlet.java
diff --git a/...ionapp/servlets/RentalScooterServlet.java → ...ionapp/servlets/RentalScooterServlet.java b/...ionapp/servlets/RentalScooterServlet.java → ...ionapp/servlets/RentalScooterServlet.java
diff --git a/...app/src/main/resources/META-INF/beans.xml → ...app/src/main/resources/META-INF/beans.xml b/...app/src/main/resources/META-INF/beans.xml → ...app/src/main/resources/META-INF/beans.xml
diff --git a/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml b/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml
diff --git a/...WEB-INF/lib/jakarta.servlet-api-6.1.0.jar → ...WEB-INF/lib/jakarta.servlet-api-6.1.0.jar b/...WEB-INF/lib/jakarta.servlet-api-6.1.0.jar → ...WEB-INF/lib/jakarta.servlet-api-6.1.0.jar
diff --git a/...c/main/webapp/WEB-INF/views/dashboard.jsp → ...c/main/webapp/WEB-INF/views/dashboard.jsp b/...c/main/webapp/WEB-INF/views/dashboard.jsp → ...c/main/webapp/WEB-INF/views/dashboard.jsp
diff --git a/...p/src/main/webapp/WEB-INF/views/login.jsp → ...p/src/main/webapp/WEB-INF/views/login.jsp b/...p/src/main/webapp/WEB-INF/views/login.jsp → ...p/src/main/webapp/WEB-INF/views/login.jsp
diff --git a/...src/main/webapp/WEB-INF/views/profile.jsp → ...src/main/webapp/WEB-INF/views/profile.jsp b/...src/main/webapp/WEB-INF/views/profile.jsp → ...src/main/webapp/WEB-INF/views/profile.jsp
diff --git a/...rc/main/webapp/WEB-INF/views/register.jsp → ...rc/main/webapp/WEB-INF/views/register.jsp b/...rc/main/webapp/WEB-INF/views/register.jsp → ...rc/main/webapp/WEB-INF/views/register.jsp
diff --git a/...c/main/webapp/WEB-INF/views/rent-bike.jsp → ...c/main/webapp/WEB-INF/views/rent-bike.jsp b/...c/main/webapp/WEB-INF/views/rent-bike.jsp → ...c/main/webapp/WEB-INF/views/rent-bike.jsp
diff --git a/...rc/main/webapp/WEB-INF/views/rent-car.jsp → ...rc/main/webapp/WEB-INF/views/rent-car.jsp b/...rc/main/webapp/WEB-INF/views/rent-car.jsp → ...rc/main/webapp/WEB-INF/views/rent-car.jsp
diff --git a/...ain/webapp/WEB-INF/views/rent-scooter.jsp → ...ain/webapp/WEB-INF/views/rent-scooter.jsp b/...ain/webapp/WEB-INF/views/rent-scooter.jsp → ...ain/webapp/WEB-INF/views/rent-scooter.jsp
diff --git a/promotionapp/src/main/webapp/WEB-INF/web.xml → client-app/src/main/webapp/WEB-INF/web.xml b/promotionapp/src/main/webapp/WEB-INF/web.xml → client-app/src/main/webapp/WEB-INF/web.xml
diff --git a/promotionapp/src/main/webapp/index.jsp → client-app/src/main/webapp/index.jsp b/promotionapp/src/main/webapp/index.jsp → client-app/src/main/webapp/index.jsp
diff --git a/...p/src/main/webapp/scripts/jquery-3.7.1.js → ...p/src/main/webapp/scripts/jquery-3.7.1.js b/...p/src/main/webapp/scripts/jquery-3.7.1.js → ...p/src/main/webapp/scripts/jquery-3.7.1.js
diff --git a/...otionapp/src/main/webapp/scripts/timer.js → client-app/src/main/webapp/scripts/timer.js b/...otionapp/src/main/webapp/scripts/timer.js → client-app/src/main/webapp/scripts/timer.js
diff --git a/...app/src/main/webapp/styles/stylesheet.css → ...app/src/main/webapp/styles/stylesheet.css b/...app/src/main/webapp/styles/stylesheet.css → ...app/src/main/webapp/styles/stylesheet.css
diff --git a/promotion-app/.gitignore b/promotion-app/.gitignore
@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
diff --git a/promotion-app/.idea/.gitignore b/promotion-app/.idea/.gitignore
diff --git a/promotion-app/.idea/encodings.xml b/promotion-app/.idea/encodings.xml
diff --git a/promotion-app/.idea/inspectionProfiles/Project_Default.xml b/promotion-app/.idea/inspectionProfiles/Project_Default.xml
diff --git a/promotion-app/.idea/misc.xml b/promotion-app/.idea/misc.xml
diff --git a/promotionapp/.idea/vcs.xml → promotion-app/.idea/vcs.xml b/promotionapp/.idea/vcs.xml → promotion-app/.idea/vcs.xml
diff --git a/promotion-app/.mvn/wrapper/maven-wrapper.jar b/promotion-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/promotion-app/.mvn/wrapper/maven-wrapper.properties b/promotion-app/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
		wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar