From 1386d5529050b9d82eefed0b6e62801e875832e8 Mon Sep 17 00:00:00 2001 From: Ros Date: Tue, 11 Jul 2023 21:34:47 +0100 Subject: [PATCH] Controllers have been created. There is a successful operation page and a simple main page that showcases the entire functionality and brilliance of the design concept (which took half a lifetime to develop). The only thing I didn't quite understand was how to properly name the JSP files. Then the database was connected (seemingly successfully). In the model package, I added several constructors to the files located there. Then I tried to format everything correctly, but I got tangled up a thousand times, so I hope everything is working correctly --- pom.xml | 6 + .../java/mate/controller/IndexController.java | 6 +- .../mate/controller/SuccessController.java | 17 +++ .../mate/controller/car/AddCarController.java | 52 ++++++++ .../car/AddDriverToCarController.java | 44 +++++++ .../controller/car/DeleteCarController.java | 25 ++++ .../car/GetAllByDriverController.java | 28 +++++ .../driver/CreateDriverController.java | 39 ++++++ .../driver/DeleteDriverController.java | 25 ++++ .../driver/GetAllDriverController.java | 27 +++++ .../AddManufacturerController.java | 37 ++++++ .../DeleteManufacturerController.java | 26 ++++ .../GetAllManufacturerController.java | 28 +++++ src/main/java/mate/model/Car.java | 9 ++ src/main/java/mate/model/Driver.java | 14 +++ src/main/java/mate/model/Manufacturer.java | 8 ++ src/main/java/mate/util/ConnectionUtil.java | 8 +- src/main/webapp/WEB-INF/views/cars/add.jsp | 82 +++++++++++++ src/main/webapp/WEB-INF/views/cars/all.jsp | 80 +++++++++++++ .../webapp/WEB-INF/views/cars/drivers/add.jsp | 78 ++++++++++++ src/main/webapp/WEB-INF/views/drivers/add.jsp | 74 ++++++++++++ src/main/webapp/WEB-INF/views/drivers/all.jsp | 72 +++++++++++ src/main/webapp/WEB-INF/views/index.jsp | 113 +++++++++++++++++- .../WEB-INF/views/manufacturers/add.jsp | 72 +++++++++++ .../WEB-INF/views/manufacturers/all.jsp | 72 +++++++++++ src/main/webapp/WEB-INF/views/success.jsp | 44 +++++++ src/main/webapp/web.xml | 11 +- 27 files changed, 1079 insertions(+), 18 deletions(-) create mode 100644 src/main/java/mate/controller/SuccessController.java create mode 100644 src/main/java/mate/controller/car/AddCarController.java create mode 100644 src/main/java/mate/controller/car/AddDriverToCarController.java create mode 100644 src/main/java/mate/controller/car/DeleteCarController.java create mode 100644 src/main/java/mate/controller/car/GetAllByDriverController.java create mode 100644 src/main/java/mate/controller/driver/CreateDriverController.java create mode 100644 src/main/java/mate/controller/driver/DeleteDriverController.java create mode 100644 src/main/java/mate/controller/driver/GetAllDriverController.java create mode 100644 src/main/java/mate/controller/manufacturer/AddManufacturerController.java create mode 100644 src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java create mode 100644 src/main/java/mate/controller/manufacturer/GetAllManufacturerController.java create mode 100644 src/main/webapp/WEB-INF/views/cars/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/cars/all.jsp create mode 100644 src/main/webapp/WEB-INF/views/cars/drivers/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/drivers/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/drivers/all.jsp create mode 100644 src/main/webapp/WEB-INF/views/manufacturers/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/manufacturers/all.jsp create mode 100644 src/main/webapp/WEB-INF/views/success.jsp diff --git a/pom.xml b/pom.xml index 8f7cf6b7d..e95abc931 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,12 @@ 4.0.1 provided + + + javax.servlet + jstl + 1.2 + diff --git a/src/main/java/mate/controller/IndexController.java b/src/main/java/mate/controller/IndexController.java index 27bcd4faa..06b1eda6a 100644 --- a/src/main/java/mate/controller/IndexController.java +++ b/src/main/java/mate/controller/IndexController.java @@ -2,14 +2,16 @@ import java.io.IOException; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +@WebServlet(urlPatterns = "/index") public class IndexController extends HttpServlet { @Override - public void doGet(HttpServletRequest req, HttpServletResponse resp) + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - req.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(req, resp); + req.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(req,resp); } } diff --git a/src/main/java/mate/controller/SuccessController.java b/src/main/java/mate/controller/SuccessController.java new file mode 100644 index 000000000..82370633a --- /dev/null +++ b/src/main/java/mate/controller/SuccessController.java @@ -0,0 +1,17 @@ +package mate.controller; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet(urlPatterns = "/success") +public class SuccessController extends HttpServlet { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/success.jsp").forward(req, resp); + } +} diff --git a/src/main/java/mate/controller/car/AddCarController.java b/src/main/java/mate/controller/car/AddCarController.java new file mode 100644 index 000000000..12d0548ee --- /dev/null +++ b/src/main/java/mate/controller/car/AddCarController.java @@ -0,0 +1,52 @@ +package mate.controller.car; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Car; +import mate.model.Driver; +import mate.model.Manufacturer; +import mate.service.CarService; +import mate.service.DriverService; +import mate.service.ManufacturerService; + +@WebServlet(urlPatterns = "/cars/add") +public class AddCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final CarService carService = + (CarService) injector.getInstance(CarService.class); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List manufacturers = manufacturerService.getAll(); + req.setAttribute("manufacturers", manufacturers); + List drivers = driverService.getAll(); + req.setAttribute("drivers", drivers); + req.getRequestDispatcher("/WEB-INF/views/cars/add.jsp").forward(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws IOException { + Long id = Long.valueOf(req.getParameter("manufacturer")); + Car car = new Car(); + Manufacturer manufacturer = manufacturerService.get(id); + car.setModel(req.getParameter("model")); + car.setManufacturer(manufacturer); + List drivers = new ArrayList<>(); + car.setDrivers(drivers); + carService.create(car); + resp.sendRedirect(req.getContextPath() + "/cars"); + } +} diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java new file mode 100644 index 000000000..8ad4b3b3d --- /dev/null +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -0,0 +1,44 @@ +package mate.controller.car; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Car; +import mate.model.Driver; +import mate.service.CarService; +import mate.service.DriverService; + +@WebServlet(urlPatterns = "/cars/drivers/add") +public class AddDriverToCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final CarService carService = + (CarService) injector.getInstance(CarService.class); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List cars = carService.getAll(); + req.setAttribute("cars", cars); + List drivers = driverService.getAll(); + req.setAttribute("drivers", drivers); + req.getRequestDispatcher("/WEB-INF/views/cars/drivers/add.jsp").forward(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Long driverId = Long.valueOf(req.getParameter("driver_id")); + Long carId = Long.valueOf(req.getParameter("car_id")); + Driver driver = driverService.get(driverId); + Car car = carService.get(carId); + carService.addDriverToCar(driver, car); + resp.sendRedirect(req.getContextPath() + "/cars"); + } +} diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java new file mode 100644 index 000000000..ada714e40 --- /dev/null +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -0,0 +1,25 @@ +package mate.controller.car; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.service.CarService; + +@WebServlet("/cars/delete") +public class DeleteCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final CarService carService = + (CarService) injector.getInstance(CarService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Long id = Long.valueOf(req.getParameter("id")); + carService.delete(id); + resp.sendRedirect(req.getContextPath() + "/cars/all"); + } +} diff --git a/src/main/java/mate/controller/car/GetAllByDriverController.java b/src/main/java/mate/controller/car/GetAllByDriverController.java new file mode 100644 index 000000000..170b40d5c --- /dev/null +++ b/src/main/java/mate/controller/car/GetAllByDriverController.java @@ -0,0 +1,28 @@ +package mate.controller.car; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Car; +import mate.service.CarService; + +@WebServlet(urlPatterns = "/cars") +public class GetAllByDriverController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final CarService carService = + (CarService) injector.getInstance(CarService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List cars = carService.getAll(); + req.setAttribute("cars", cars); + req.getRequestDispatcher("/WEB-INF/views/cars/all.jsp") + .forward(req, resp); + } +} diff --git a/src/main/java/mate/controller/driver/CreateDriverController.java b/src/main/java/mate/controller/driver/CreateDriverController.java new file mode 100644 index 000000000..90534cee8 --- /dev/null +++ b/src/main/java/mate/controller/driver/CreateDriverController.java @@ -0,0 +1,39 @@ +package mate.controller.driver; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Driver; +import mate.service.DriverService; + +@WebServlet(urlPatterns = "/drivers/add") +public class CreateDriverController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/drivers/add.jsp") + .forward(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + String name = req.getParameter("name"); + String licenseNumber = req.getParameter("license_number"); + + Driver driver = new Driver(); + driver.setName(name); + driver.setLicenseNumber(licenseNumber); + + driverService.create(driver); + resp.sendRedirect(req.getContextPath() + "/drivers"); + } +} diff --git a/src/main/java/mate/controller/driver/DeleteDriverController.java b/src/main/java/mate/controller/driver/DeleteDriverController.java new file mode 100644 index 000000000..7818b9313 --- /dev/null +++ b/src/main/java/mate/controller/driver/DeleteDriverController.java @@ -0,0 +1,25 @@ +package mate.controller.driver; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.service.DriverService; + +@WebServlet("/drivers/delete") +public class DeleteDriverController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Long id = Long.valueOf(req.getParameter("id")); + driverService.delete(id); + resp.sendRedirect(req.getContextPath() + "/drivers"); + } +} diff --git a/src/main/java/mate/controller/driver/GetAllDriverController.java b/src/main/java/mate/controller/driver/GetAllDriverController.java new file mode 100644 index 000000000..f0d20f4f8 --- /dev/null +++ b/src/main/java/mate/controller/driver/GetAllDriverController.java @@ -0,0 +1,27 @@ +package mate.controller.driver; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Driver; +import mate.service.DriverService; + +@WebServlet(urlPatterns = "/drivers") +public class GetAllDriverController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List drivers = driverService.getAll(); + req.setAttribute("drivers", drivers); + req.getRequestDispatcher("/WEB-INF/views/drivers/all.jsp").forward(req, resp); + } +} diff --git a/src/main/java/mate/controller/manufacturer/AddManufacturerController.java b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java new file mode 100644 index 000000000..3fdfb2b75 --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java @@ -0,0 +1,37 @@ +package mate.controller.manufacturer; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Manufacturer; +import mate.service.ManufacturerService; + +@WebServlet(urlPatterns = "/manufacturers/add") +public class AddManufacturerController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/manufacturers/add.jsp") + .forward(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + String name = req.getParameter("name"); + String country = req.getParameter("country"); + Manufacturer manufacturer = new Manufacturer(); + manufacturer.setName(name); + manufacturer.setCountry(country); + manufacturerService.create(manufacturer); + resp.sendRedirect(req.getContextPath() + "/success"); + } +} diff --git a/src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java b/src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java new file mode 100644 index 000000000..e35ca83cc --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java @@ -0,0 +1,26 @@ +package mate.controller.manufacturer; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.service.ManufacturerService; + +@WebServlet("/manufacturers/delete") +public class DeleteManufacturerController extends HttpServlet { + + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Long id = Long.valueOf(req.getParameter("id")); + manufacturerService.delete(id); + resp.sendRedirect(req.getContextPath() + "/manufacturers"); + } +} diff --git a/src/main/java/mate/controller/manufacturer/GetAllManufacturerController.java b/src/main/java/mate/controller/manufacturer/GetAllManufacturerController.java new file mode 100644 index 000000000..1643f62d8 --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/GetAllManufacturerController.java @@ -0,0 +1,28 @@ +package mate.controller.manufacturer; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Manufacturer; +import mate.service.ManufacturerService; + +@WebServlet(urlPatterns = "/manufacturers") +public class GetAllManufacturerController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List manufacturers = manufacturerService.getAll(); + req.setAttribute("manufacturers", manufacturers); + req.getRequestDispatcher("/WEB-INF/views/manufacturers/all.jsp") + .forward(req, resp); + } +} diff --git a/src/main/java/mate/model/Car.java b/src/main/java/mate/model/Car.java index 5cabe9ca6..a37df52d2 100644 --- a/src/main/java/mate/model/Car.java +++ b/src/main/java/mate/model/Car.java @@ -9,6 +9,15 @@ public class Car { private Manufacturer manufacturer; private List drivers; + public Car() { + } + + public Car(String model, Manufacturer manufacturer, List drivers) { + this.model = model; + this.manufacturer = manufacturer; + this.drivers = drivers; + } + public Long getId() { return id; } diff --git a/src/main/java/mate/model/Driver.java b/src/main/java/mate/model/Driver.java index 49306359c..ddac89a9f 100644 --- a/src/main/java/mate/model/Driver.java +++ b/src/main/java/mate/model/Driver.java @@ -7,6 +7,20 @@ public class Driver { private String name; private String licenseNumber; + public Driver() { + } + + public Driver(String name, String licenseNumber) { + this.name = name; + this.licenseNumber = licenseNumber; + } + + public Driver(Long id, String name, String licenseNumber) { + this.id = id; + this.name = name; + this.licenseNumber = licenseNumber; + } + public Long getId() { return id; } diff --git a/src/main/java/mate/model/Manufacturer.java b/src/main/java/mate/model/Manufacturer.java index b3ff7b966..9176b6e2d 100644 --- a/src/main/java/mate/model/Manufacturer.java +++ b/src/main/java/mate/model/Manufacturer.java @@ -7,6 +7,14 @@ public class Manufacturer { private String name; private String country; + public Manufacturer() { + } + + public Manufacturer(String name, String country) { + this.name = name; + this.country = country; + } + public Long getId() { return id; } diff --git a/src/main/java/mate/util/ConnectionUtil.java b/src/main/java/mate/util/ConnectionUtil.java index a9249b004..b0241645a 100644 --- a/src/main/java/mate/util/ConnectionUtil.java +++ b/src/main/java/mate/util/ConnectionUtil.java @@ -6,10 +6,10 @@ import java.util.Properties; public class ConnectionUtil { - private static final String URL = "YOUR DATABASE URL"; - private static final String USERNAME = "YOUR USERNAME"; - private static final String PASSWORD = "YOUR PASSWORD"; - private static final String JDBC_DRIVER = "YOUR DRIVER"; + private static final String URL = "jdbc:mysql://localhost:3306/taxi"; + private static final String USERNAME = "root"; + private static final String PASSWORD = "13289812"; + private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver"; static { try { diff --git a/src/main/webapp/WEB-INF/views/cars/add.jsp b/src/main/webapp/WEB-INF/views/cars/add.jsp new file mode 100644 index 000000000..dc948f8ae --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/add.jsp @@ -0,0 +1,82 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + Create a Car + + + +

Create a Car

+
+ + + + + + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cars/all.jsp b/src/main/webapp/WEB-INF/views/cars/all.jsp new file mode 100644 index 000000000..cc7e13358 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/all.jsp @@ -0,0 +1,80 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + All Cars + + + +

All Cars

+ + + + + + + + + + + + + + + + + + + +
IDMODELMANUFACTURER NAMEMANUFACTURER COUNTRYDRIVERSDELETE
+ +
+ + 		+ delete +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp b/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp new file mode 100644 index 000000000..598f85afc --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp @@ -0,0 +1,78 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + Add Driver to Car + + + +

Add Driver to Car

+
+ + + + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/drivers/add.jsp b/src/main/webapp/WEB-INF/views/drivers/add.jsp new file mode 100644 index 000000000..27750989a --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/add.jsp @@ -0,0 +1,74 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + Create a Driver + + + +

Create a Driver

+
+ + + + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/views/drivers/all.jsp b/src/main/webapp/WEB-INF/views/drivers/all.jsp new file mode 100644 index 000000000..849bd19e6 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/all.jsp @@ -0,0 +1,72 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + All Drivers + + + +

All Drivers

+ + + + + + + + + + + + + + + +
IDNAMELICENSE NUMBERDELETE
+ delete +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 0fbc5292a..9441dcb8f 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -1,9 +1,114 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> - My team + Admin panel + -

Hello, mates!

+
+
+

Hello, user!

+
+ +
+

Create

+ + + +
+ +
+

Edit

+ +
+ +
+

Display

+ + + +
+
- + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/manufacturers/add.jsp b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp new file mode 100644 index 000000000..54db7ea30 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp @@ -0,0 +1,72 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + Create a Manufacturer + + + +

Create a Manufacturer

+
+ + + + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/manufacturers/all.jsp b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp new file mode 100644 index 000000000..997cf818f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp @@ -0,0 +1,72 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + All Manufacturers + + + +

All Manufacturers

+ + + + + + + + + + + + + + + +
IDNAMECOUNTRYDELETE
+ delete +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/success.jsp b/src/main/webapp/WEB-INF/views/success.jsp new file mode 100644 index 000000000..c59533eef --- /dev/null +++ b/src/main/webapp/WEB-INF/views/success.jsp @@ -0,0 +1,44 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" language="java" %> + + + Successful + + + +

Operation was successful

+ + + + \ No newline at end of file diff --git a/src/main/webapp/web.xml b/src/main/webapp/web.xml index 00afaeb93..b32adec00 100644 --- a/src/main/webapp/web.xml +++ b/src/main/webapp/web.xml @@ -3,12 +3,7 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd" version="4.0"> - - index - mate.controller.IndexController - - - index - /index - + + +