From ef0442d19d825d9e2734a72edd0970f902654db1 Mon Sep 17 00:00:00 2001 From: JohannBulls Date: Sun, 19 Nov 2023 23:39:33 -0500 Subject: [PATCH 1/9] Nuevas vistas no implementadas --- src/main/resources/js/script.js | 14 - src/main/resources/static/css/style.css | 11 +- src/main/resources/static/index.html | 94 ++++-- src/main/resources/{ => static}/js/all.min.js | 0 .../{ => static}/js/bootstrap.bundle.min.js | 0 .../{ => static}/js/bootstrap.min.js | 0 .../resources/{ => static}/js/fontawesome.js | 0 src/main/resources/static/js/script.js | 41 +++ src/main/resources/templates/about-us.html | 115 +++++++ src/main/resources/templates/admin/admin.html | 299 +++++++++++++++++ src/main/resources/templates/contact-us.html | 127 +++++++ .../resources/templates/forgotPassword.html | 10 +- src/main/resources/templates/login.html | 6 +- src/main/resources/templates/register.html | 4 +- src/main/resources/templates/user/user.html | 310 ++++++++++++++++++ 15 files changed, 974 insertions(+), 57 deletions(-) delete mode 100644 src/main/resources/js/script.js rename src/main/resources/{ => static}/js/all.min.js (100%) rename src/main/resources/{ => static}/js/bootstrap.bundle.min.js (100%) rename src/main/resources/{ => static}/js/bootstrap.min.js (100%) rename src/main/resources/{ => static}/js/fontawesome.js (100%) create mode 100644 src/main/resources/static/js/script.js create mode 100644 src/main/resources/templates/about-us.html create mode 100644 src/main/resources/templates/admin/admin.html create mode 100644 src/main/resources/templates/contact-us.html create mode 100644 src/main/resources/templates/user/user.html diff --git a/src/main/resources/js/script.js b/src/main/resources/js/script.js deleted file mode 100644 index 4b9d818..0000000 --- a/src/main/resources/js/script.js +++ /dev/null @@ -1,14 +0,0 @@ -$(document).ready(function() { - $("#password-toggle, #confirm-password-toggle").click(function() { - var inputField = $(this).parent().find("input"); - var passwordIcon = $(this).find("i"); - - if (inputField.attr("type") === "password") { - inputField.attr("type", "text"); - passwordIcon.removeClass("fa-eye").addClass("fa-eye-slash"); - } else { - inputField.attr("type", "password"); - passwordIcon.removeClass("fa-eye-slash").addClass("fa-eye"); - } - }); -}); diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 2e7808e..0cf9caf 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -101,4 +101,13 @@ body { .product-card img { max-width: 100%; - } \ No newline at end of file + } + +.liveAlertPlaceholder { + position: fixed; + top: 0; + right: 0; + z-index: 10000; /* Ajusta el z-index según sea necesario para estar por encima de todo */ + width: 300px; /* Ajusta el ancho según sea necesario */ + margin: 10px; /* Ajusta el margen según sea necesario */ + } \ No newline at end of file diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index f449478..8f7c275 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -8,8 +8,8 @@ Food Express - + @@ -107,7 +107,7 @@
- Imagen 1 + Imagen 1

Example headline.

@@ -123,24 +123,23 @@

Example headline.

Imagen 2
-

Another example headline.

+

Reserva Ahora y Deléitate con lo Mejor de la Gastronomía.

- Some representative placeholder content for the second slide of - the carousel. + Haz tu reserva ahora y descubre por qué somos la elección preferida de los amantes de la buena comida

-

Learn more

+

Reserva

Imagen 3 @@ -206,33 +205,64 @@

One more for good measure.

- -
-
- - - - - Menú -
-
-
-
-
-
-
-
Product Name
-

$28.00

- Add to Cart +
+
+
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
-
- Product Image +
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
-
@@ -243,6 +273,6 @@
Product Name
integrity="sha384-KyZXEAg3QhqLMpG8r+Jz7CEfNuUq7Fk9l4zj6pqc6bVi+O5/DvjN1q5EMWz2VfE3J" crossorigin="anonymous" > - + diff --git a/src/main/resources/js/all.min.js b/src/main/resources/static/js/all.min.js similarity index 100% rename from src/main/resources/js/all.min.js rename to src/main/resources/static/js/all.min.js diff --git a/src/main/resources/js/bootstrap.bundle.min.js b/src/main/resources/static/js/bootstrap.bundle.min.js similarity index 100% rename from src/main/resources/js/bootstrap.bundle.min.js rename to src/main/resources/static/js/bootstrap.bundle.min.js diff --git a/src/main/resources/js/bootstrap.min.js b/src/main/resources/static/js/bootstrap.min.js similarity index 100% rename from src/main/resources/js/bootstrap.min.js rename to src/main/resources/static/js/bootstrap.min.js diff --git a/src/main/resources/js/fontawesome.js b/src/main/resources/static/js/fontawesome.js similarity index 100% rename from src/main/resources/js/fontawesome.js rename to src/main/resources/static/js/fontawesome.js diff --git a/src/main/resources/static/js/script.js b/src/main/resources/static/js/script.js new file mode 100644 index 0000000..9d53ec7 --- /dev/null +++ b/src/main/resources/static/js/script.js @@ -0,0 +1,41 @@ +$(document).ready(function() { + // Cambiar la visibilidad de la contraseña + $("#password-toggle, #confirm-password-toggle").click(function() { + var inputField = $(this).parent().find("input"); + var passwordIcon = $(this).find("i"); + + if (inputField.attr("type") === "password") { + inputField.attr("type", "text"); + passwordIcon.removeClass("fa-eye").addClass("fa-eye-slash"); + } else { + inputField.attr("type", "password"); + passwordIcon.removeClass("fa-eye-slash").addClass("fa-eye"); + } + }); + + // Mostrar alertas personalizadas + const alertPlaceholder = document.getElementById('liveAlertPlaceholder'); + + const appendAlert = (message, type) => { + const wrapper = document.createElement('div'); + wrapper.innerHTML = ` + + `; + + // Limpiar alertas anteriores + alertPlaceholder.innerHTML = ''; + alertPlaceholder.append(wrapper); + }; + + const alertTrigger = document.getElementById('liveAlertBtn'); + if (alertTrigger) { + alertTrigger.addEventListener('click', () => { + appendAlert('Nice, you triggered this alert message!', 'success'); + }); + } +}); diff --git a/src/main/resources/templates/about-us.html b/src/main/resources/templates/about-us.html new file mode 100644 index 0000000..db7e726 --- /dev/null +++ b/src/main/resources/templates/about-us.html @@ -0,0 +1,115 @@ + + + + + + + + About Us + + + + + + + +
+ +
+
+
+
+

Sobre Nosotros

+

+ En Food Express, hemos transformado la experiencia culinaria para superar desafíos comunes en la industria alimentaria. Nos enorgullece ofrecer soluciones innovadoras a problemas que afectan tanto a nuestros clientes como a nuestro equipo. +

+

Compromiso con la Eficiencia:

+

+ Hemos eliminado los largos tiempos de espera en filas gracias a nuestra variedad de métodos de pago y opciones de pedidos anticipados, garantizando que disfrutes de tu comida sin demoras innecesarias. +

+

Sostenibilidad y Frescura:

+

+ Abordamos el problema del vencimiento de ingredientes al trabajar con proveedores locales, asegurando la frescura de nuestros insumos y reduciendo el desperdicio de alimentos. +

+

Innovación en el Servicio al Cliente:

+

+ Eliminamos la necesidad de cajeros y "meseros" al incorporar sistemas de pago automatizados, reduciendo costos y mejorando la atención al cliente con una experiencia más ágil. +

+
+
+
+ + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/admin.html b/src/main/resources/templates/admin/admin.html new file mode 100644 index 0000000..a4f00d3 --- /dev/null +++ b/src/main/resources/templates/admin/admin.html @@ -0,0 +1,299 @@ + + + + + + + + Food Express + + + + + +
+ + + + + + + +
+
+
+
+ + + + Tiempo de espera corto. +
+
+
+
+ + + + Planes de fidelizacion. +
+
+ +
+
+ + + + Medios de pagos diversos. +
+
+ + +
+
+
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+
+
+ + + + + + + + + + + + diff --git a/src/main/resources/templates/contact-us.html b/src/main/resources/templates/contact-us.html new file mode 100644 index 0000000..8c05b12 --- /dev/null +++ b/src/main/resources/templates/contact-us.html @@ -0,0 +1,127 @@ + + + + + + + + Contact Us + + + + + + + +
+ +
+
+
+
+
+
+
+ +
+

Contáctanos

+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/forgotPassword.html b/src/main/resources/templates/forgotPassword.html index 87d732d..dc7d092 100644 --- a/src/main/resources/templates/forgotPassword.html +++ b/src/main/resources/templates/forgotPassword.html @@ -6,10 +6,10 @@ Forgot password - + - - + + @@ -165,7 +165,7 @@

Forgot Password

- - + + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index f727228..5195175 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -8,7 +8,7 @@ Login - + @@ -181,7 +181,7 @@

Login

- - + + diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 8d02cfa..ce924cc 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -227,7 +227,7 @@

Bienvenido

- - + + diff --git a/src/main/resources/templates/user/user.html b/src/main/resources/templates/user/user.html new file mode 100644 index 0000000..9c0d87f --- /dev/null +++ b/src/main/resources/templates/user/user.html @@ -0,0 +1,310 @@ + + + + + + + + Food Express + + + + + +
+ + + + + + + +
+
+
+
+ + + + Tiempo de espera corto. +
+
+
+
+ + + + Planes de fidelizacion. +
+
+ +
+
+ + + + Medios de pagos diversos. +
+
+ + +
+
+
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+ +
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+
+
+ Product Image +
+
Product Name
+

$28.00

+ Add to Cart +
+
+
+
+
+ + + + + + + + + + + + From 8286ea1c9c6983b28d07dcdab18c0f59dd5d4311 Mon Sep 17 00:00:00 2001 From: ChristianDuarteR Date: Mon, 20 Nov 2023 13:34:26 -0500 Subject: [PATCH 2/9] Gestion de Platos --- .../Proyecto/GestorAlmuerzo/FoodExpress.java | 47 +++++--- .../Repository/CategoryRepository.java | 8 ++ .../Repository/PlateRepository.java | 6 +- .../controller/MenuController.java | 87 +++++++++++++++ .../GestorAlmuerzo/model/Category.java | 58 ++++++++++ .../Proyecto/GestorAlmuerzo/model/Plate.java | 71 ++++++++---- .../Proyecto/GestorAlmuerzo/model/Role.java | 2 +- .../service/CategoryServices.java | 32 ++++++ .../GestorAlmuerzo/service/PlateServices.java | 39 ++++++- src/main/resources/application.properties | 28 +++-- .../resources/templates/admin/editPlate.html | 44 ++++++++ src/main/resources/templates/admin/menu.html | 101 ++++++++++++++++++ .../resources/templates/forgotPassword.html | 6 +- .../{static => templates}/index.html | 0 src/main/resources/templates/login.html | 6 +- src/main/resources/templates/register.html | 6 +- 16 files changed, 484 insertions(+), 57 deletions(-) create mode 100644 src/main/java/Proyecto/GestorAlmuerzo/Repository/CategoryRepository.java create mode 100644 src/main/java/Proyecto/GestorAlmuerzo/controller/MenuController.java create mode 100644 src/main/java/Proyecto/GestorAlmuerzo/model/Category.java create mode 100644 src/main/java/Proyecto/GestorAlmuerzo/service/CategoryServices.java create mode 100644 src/main/resources/templates/admin/editPlate.html create mode 100644 src/main/resources/templates/admin/menu.html rename src/main/resources/{static => templates}/index.html (100%) diff --git a/src/main/java/Proyecto/GestorAlmuerzo/FoodExpress.java b/src/main/java/Proyecto/GestorAlmuerzo/FoodExpress.java index 8f10ae4..2b3422e 100644 --- a/src/main/java/Proyecto/GestorAlmuerzo/FoodExpress.java +++ b/src/main/java/Proyecto/GestorAlmuerzo/FoodExpress.java @@ -1,6 +1,8 @@ package Proyecto.GestorAlmuerzo; +import Proyecto.GestorAlmuerzo.model.Category; import Proyecto.GestorAlmuerzo.service.AppServices; +import Proyecto.GestorAlmuerzo.service.CategoryServices; import Proyecto.GestorAlmuerzo.service.UserServices; import Proyecto.GestorAlmuerzo.service.PlateServices; import Proyecto.GestorAlmuerzo.model.User; @@ -12,6 +14,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; +import java.util.HashSet; +import java.util.Optional; +import java.util.Set; + @SpringBootApplication public class FoodExpress { @Autowired @@ -20,6 +26,9 @@ public class FoodExpress { @Autowired AppServices appService; + @Autowired + CategoryServices categoryServices; + @Autowired PlateServices plateServices; public static void main(String[] args) { @@ -27,6 +36,7 @@ public static void main(String[] args) { } + @Bean public CommandLineRunner run() throws Exception { return (args) -> { @@ -34,20 +44,27 @@ public CommandLineRunner run() throws Exception { appService.addRol(new Role("2", "administrador")); appService.addRol(new Role("3", "empleado")); usuarioService.addUser(new User("sebastian@foodexpres.com", "Sebastian", "Zamora", "1234", "1")); - plateServices.addPlate(new Plate("1", "Brillo Andino", "Ensalada de quinoa con aguacate y tomate cherry")); - plateServices.addPlate(new Plate("2", "Delicia Marina", "Carpaccio de salmón con alcaparras y limón")); - plateServices.addPlate(new Plate("3", "Susurros Tropicales", "Crema de calabaza con jengibre y coco")); - plateServices.addPlate(new Plate("4", "Aromas de la Tierra", "Sopa de lentejas con chorizo y espinacas")); - plateServices.addPlate(new Plate("5", "Melodía de Sabores", "Solomillo de ternera con salsa de vino tinto")); - plateServices.addPlate(new Plate("6", "Fusión Exótica", "Pollo al curry con leche de coco y verduras")); - plateServices.addPlate(new Plate("7", "Ritmo del Mar", "Filete de salmón a la parrilla con salsa de eneldo")); - plateServices.addPlate(new Plate("8", "Viaje a la Costa", "Paella de mariscos")); - plateServices.addPlate(new Plate("9", "Armonía en el Plato", "Risotto de champiñones y espinacas")); - plateServices.addPlate(new Plate("10", "Capricho Vegetal", "Lasaña de berenjena con ricotta y espinacas")); - plateServices.addPlate(new Plate("11", "Dulce Contraste", "Puré de batata con nueces y miel")); - plateServices.addPlate(new Plate("12", "Elegancia Verde", "Brócoli al vapor con almendras tostadas")); - plateServices.addPlate(new Plate("13", "Tradición Italiana", "Lasaña boloñesa")); - plateServices.addPlate(new Plate("14", "Fiesta Mexicana", "Tacos de carnitas con salsa de aguacate")); - plateServices.getAllPlates().forEach(plate -> System.out.println(plate)); + categoryServices.addCategory(new Category("Ensalada")); + categoryServices.addCategory(new Category("Postre")); + categoryServices.addCategory(new Category("Entradas")); + categoryServices.addCategory(new Category("Plato Principal")); + categoryServices.addCategory(new Category("Especiales")); + categoryServices.addCategory(new Category("Nuevo Plato")); + Set defaulCategoria = new HashSet<>(); + defaulCategoria.add(categoryServices.getCategoryByName("salads")); + plateServices.addPlate(new Plate(1, "Brillo Andino", "Ensalada de quinoa con aguacate y tomate cherry",12000,defaulCategoria)); + plateServices.addPlate(new Plate(2, "Delicia Marina", "Carpaccio de salmón con alcaparras y limón",13000,defaulCategoria)); + plateServices.addPlate(new Plate(3, "Susurros Tropicales", "Crema de calabaza con jengibre y coco",11000,defaulCategoria)); + plateServices.addPlate(new Plate(4, "Aromas de la Tierra", "Sopa de lentejas con chorizo y espinacas",12300,defaulCategoria)); + plateServices.addPlate(new Plate(5, "Melodía de Sabores", "Solomillo de ternera con salsa de vino tinto",11800,defaulCategoria)); + plateServices.addPlate(new Plate(6, "Fusión Exótica", "Pollo al curry con leche de coco y verduras",14000,defaulCategoria)); + plateServices.addPlate(new Plate(7, "Ritmo del Mar", "Filete de salmón a la parrilla con salsa de eneldo",15000,defaulCategoria)); + plateServices.addPlate(new Plate(8, "Viaje a la Costa", "Paella de mariscos",13200,defaulCategoria)); + plateServices.addPlate(new Plate(9, "Armonía en el Plato", "Risotto de champiñones y espinacas",11500,defaulCategoria)); + plateServices.addPlate(new Plate(10, "Capricho Vegetal", "Lasaña de berenjena con ricotta y espinacas",14500,defaulCategoria)); + plateServices.addPlate(new Plate(11, "Dulce Contraste", "Puré de batata con nueces y miel",10000,defaulCategoria)); + plateServices.addPlate(new Plate(12, "Elegancia Verde", "Brócoli al vapor con almendras tostadas",10800,defaulCategoria)); + plateServices.addPlate(new Plate(13, "Tradición Italiana", "Lasaña boloñesa",12100,defaulCategoria)); + plateServices.addPlate(new Plate(14, "Fiesta Mexicana", "Tacos de carnitas con salsa de aguacate",11500,defaulCategoria)); }; }} diff --git a/src/main/java/Proyecto/GestorAlmuerzo/Repository/CategoryRepository.java b/src/main/java/Proyecto/GestorAlmuerzo/Repository/CategoryRepository.java new file mode 100644 index 0000000..7d1fae1 --- /dev/null +++ b/src/main/java/Proyecto/GestorAlmuerzo/Repository/CategoryRepository.java @@ -0,0 +1,8 @@ +package Proyecto.GestorAlmuerzo.Repository; + +import Proyecto.GestorAlmuerzo.model.Category; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CategoryRepository extends JpaRepository { + Category findByName(String categoryName); +} diff --git a/src/main/java/Proyecto/GestorAlmuerzo/Repository/PlateRepository.java b/src/main/java/Proyecto/GestorAlmuerzo/Repository/PlateRepository.java index 88fa0fb..a49c0f8 100644 --- a/src/main/java/Proyecto/GestorAlmuerzo/Repository/PlateRepository.java +++ b/src/main/java/Proyecto/GestorAlmuerzo/Repository/PlateRepository.java @@ -3,7 +3,9 @@ import Proyecto.GestorAlmuerzo.model.Plate; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; + import java.util.List; +import java.util.Optional; /** * Interface que nos permite conectar con la base de datos. @@ -16,5 +18,7 @@ */ @Repository public interface PlateRepository extends JpaRepository { - List findById(Long id); + Optional findById(int id); + + List findByCategoriesId(Long categoryId); } diff --git a/src/main/java/Proyecto/GestorAlmuerzo/controller/MenuController.java b/src/main/java/Proyecto/GestorAlmuerzo/controller/MenuController.java new file mode 100644 index 0000000..5aaad8f --- /dev/null +++ b/src/main/java/Proyecto/GestorAlmuerzo/controller/MenuController.java @@ -0,0 +1,87 @@ +package Proyecto.GestorAlmuerzo.controller; + +import Proyecto.GestorAlmuerzo.model.Category; +import Proyecto.GestorAlmuerzo.model.Plate; +import Proyecto.GestorAlmuerzo.service.CategoryServices; +import Proyecto.GestorAlmuerzo.service.PlateServices; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Optional; + +@Controller +@RequestMapping("/admin/menu") +public class MenuController { + + @Autowired + private PlateServices plateServices; + + @Autowired + private CategoryServices categoryServices; + + @GetMapping + public String showMenu(@RequestParam(name = "sortBy",defaultValue = "name") String sortBy, + @RequestParam(name = "categoryFilter",required = false) Long categoryId, + Model model) { + + List menu; + + if(categoryId != null){ + menu = plateServices.findByCategoriesId(categoryId); + }else { + + if ("name".equals(sortBy)) { + menu = plateServices.getAllPlatesOrderedByName(); + } else if ("price".equals(sortBy)) { + menu = plateServices.getAllPlatesOrderedByPrice(); + } else { + menu = plateServices.getAllPlates(); + } + } + List allCategories = categoryServices.getAllCategories(); + model.addAttribute("allCategories", allCategories); + model.addAttribute("menu", menu); + return "admin/menu"; + } + + + @PostMapping("/addPlate") + public String addPlate(@ModelAttribute("plate") Plate plate) { + plateServices.addPlate(plate); + return "redirect:/admin/menu"; + } + + @GetMapping("/editPlate/{id}") + public String showEditPlateForm(@PathVariable String id, Model model) { + int plateId = Integer.parseInt(id); + Optional plate = plateServices.getPlateById(plateId); + List allCategories = categoryServices.getAllCategories(); + model.addAttribute("allCategories", allCategories); + model.addAttribute("plate", plate); + return "admin/editPlate"; + } + + @PostMapping("/editPlate/{id}") + public String editPlate(@PathVariable String id, @ModelAttribute("plate") Plate plate) { + int plateId = Integer.parseInt(id); + Optional existingPlate = plateServices.getPlateById(plateId); + if(existingPlate.isEmpty()) { + } + else { + plate.setId(plateId); + plateServices.updatePlate(plate); + } + return "redirect:/admin/menu"; + } + + @RequestMapping("/deletePlate/{id}") + public String deletePlate(@PathVariable String id) { + int plateId = Integer.parseInt(id); + plateServices.deletePlate(plateId); + return "redirect:/admin/menu"; + } +} + diff --git a/src/main/java/Proyecto/GestorAlmuerzo/model/Category.java b/src/main/java/Proyecto/GestorAlmuerzo/model/Category.java new file mode 100644 index 0000000..24dfc7d --- /dev/null +++ b/src/main/java/Proyecto/GestorAlmuerzo/model/Category.java @@ -0,0 +1,58 @@ +package Proyecto.GestorAlmuerzo.model; + +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +import jakarta.persistence.*; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Table(name = "categories") +public class Category { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + @ManyToMany(mappedBy = "categories") + private Set plates = new HashSet<>(); + + // constructores, getters y setters + + public Category() { + // Constructor vacío necesario para JPA + } + + public Category(String name) { + this.name = name; + } + + // getters y setters + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set getPlates() { + return plates; + } + + public void setPlates(Set plates) { + this.plates = plates; + } +} diff --git a/src/main/java/Proyecto/GestorAlmuerzo/model/Plate.java b/src/main/java/Proyecto/GestorAlmuerzo/model/Plate.java index 1e7cae6..0873723 100644 --- a/src/main/java/Proyecto/GestorAlmuerzo/model/Plate.java +++ b/src/main/java/Proyecto/GestorAlmuerzo/model/Plate.java @@ -1,9 +1,8 @@ package Proyecto.GestorAlmuerzo.model; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.persistence.*; + +import java.util.HashSet; +import java.util.Set; @Entity @Table(name = "Plate") @@ -18,31 +17,35 @@ */ public class Plate { @Id - private Long id; + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; @Column private String name; - @Override - public String toString() { - return "Plate{" + - "id=" + id + - ", name='" + name + '\'' + - ", description='" + description + '\'' + - '}'; - } - @Column private String description; + @Column + private int price; + + @ManyToMany + @JoinTable( + name = "plate_categories", + joinColumns = @JoinColumn(name = "plate_id"), + inverseJoinColumns = @JoinColumn(name = "category_id")) + private Set categories = new HashSet<>(); + /** * El constructor de la clase Plate. * * @param name El nombre del plato */ - public Plate(String id, String name, String description){ - this.id= Long.parseLong(id); + public Plate(Integer id, String name, String description, int price,Set categories){ + this.id= id; this.name = name; this.description = description; + this.price = price; + this.categories = categories; } public Plate(){ @@ -58,14 +61,42 @@ public String getDescription() { return description; } - public Long getId() { + public void setDescription(String description) { + this.description = description; + } + + public int getId() { return id; } - public void setDescription(String description) { - this.description = description; + public void setId(int plateId) { + this.id = plateId; } + public int getPrice() { + return price; + } + + public void setPrice(int price){ + this.price = price; + } + + public Set getCategories() { + return categories; + } + + public void setCategories(Set categories){ + this.categories = categories; + } + + @Override + public String toString() { + return "Plate{" + + "id=" + id + + ", name='" + name + '\'' + + ", description='" + description + '\'' + + '}'; + } } diff --git a/src/main/java/Proyecto/GestorAlmuerzo/model/Role.java b/src/main/java/Proyecto/GestorAlmuerzo/model/Role.java index 1cb2258..462b56e 100644 --- a/src/main/java/Proyecto/GestorAlmuerzo/model/Role.java +++ b/src/main/java/Proyecto/GestorAlmuerzo/model/Role.java @@ -47,7 +47,7 @@ public String getNombre() { * Me permite cambiar la descripción del tipo de cliente * * @param Nombre La nueva descripción del tipo de cliente - */ + **/ public void setNombre(String category) { this.category = category; } diff --git a/src/main/java/Proyecto/GestorAlmuerzo/service/CategoryServices.java b/src/main/java/Proyecto/GestorAlmuerzo/service/CategoryServices.java new file mode 100644 index 0000000..859d6bf --- /dev/null +++ b/src/main/java/Proyecto/GestorAlmuerzo/service/CategoryServices.java @@ -0,0 +1,32 @@ +package Proyecto.GestorAlmuerzo.service; + +import Proyecto.GestorAlmuerzo.Repository.CategoryRepository; +import Proyecto.GestorAlmuerzo.model.Category; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class CategoryServices { + + @Autowired + private CategoryRepository categoryRepository; + + public List getAllCategories() { + return categoryRepository.findAll(); + } + + public Optional getCategoryById(Integer id) { + return categoryRepository.findById(id); + } + + public void addCategory(Category category) { + categoryRepository.save(category); + } + + public Category getCategoryByName(String categoryName) { + return categoryRepository.findByName(categoryName); + } +} diff --git a/src/main/java/Proyecto/GestorAlmuerzo/service/PlateServices.java b/src/main/java/Proyecto/GestorAlmuerzo/service/PlateServices.java index 73aac76..533c9e6 100644 --- a/src/main/java/Proyecto/GestorAlmuerzo/service/PlateServices.java +++ b/src/main/java/Proyecto/GestorAlmuerzo/service/PlateServices.java @@ -3,23 +3,52 @@ import Proyecto.GestorAlmuerzo.Repository.PlateRepository; import Proyecto.GestorAlmuerzo.model.Plate; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; + @Service public class PlateServices { + @Autowired private PlateRepository plateRepository; - /** - * Me obtiene todos los platos que ofrece el restaurante. - * - * @return La lista de los platos que ofrece el restaurante. - */ + public List getAllPlates() { return plateRepository.findAll(); } + + public Optional getPlateById(int id) { + return plateRepository.findById(id); + } + public Plate addPlate(Plate plate) { return plateRepository.save(plate); } + + @Transactional + public void updatePlate(Plate plate) { + plateRepository.save(plate); + } + + public void deletePlate(int id) { + plateRepository.deleteById(String.valueOf(id)); + } + + public List getAllPlatesOrderedByName() { + return plateRepository.findAll(Sort.by(Sort.Direction.ASC, "name")); + } + + public List getAllPlatesOrderedByPrice() { + return plateRepository.findAll(Sort.by(Sort.Direction.ASC, "price")); + + } + + public List findByCategoriesId(Long categoryId) { + return plateRepository.findByCategoriesId(categoryId); + } } + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a03f0a4..d8e0bd0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,15 +1,31 @@ +#Config + +spring.thymeleaf.prefix=classpath:/templates/ +spring.thymeleaf.suffix=.html +spring.thymeleaf.mode=HTML5 +spring.thymeleaf.encoding=UTF-8 + # Reload spring.devtools.restart.enabled=true spring.devtools.restart.additional-paths=src,static/** +spring.web.resources.static-locations=classpath:/static/,classpath:/templates/ +spring.jpa.properties.hibernate.default_schema=sys + + spring.thymeleaf.cache = false spring.freemarker.cache = false spring.groovy.template.cache = false # ORM spring.jpa.hibernate.ddl-auto=create -spring.datasource.url=${DATABESA_URL} -spring.datasource.username=${DATABESA_NAME} -spring.datasource.password=${DATABESA_PASSWORD} -spring.datasource.driverClassName=com.mysql.jdbc.Driver -spring.jpa.show-sql=true -# \ No newline at end of file +spring.datasource.url=jdbc:mysql://localhost:3306/sys?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=my-secret-pw + +# Use the correct driver class name (update if needed) +spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver + +# Set the Hibernate dialect for MySQL +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect + +spring.jpa.show-sql=true \ No newline at end of file diff --git a/src/main/resources/templates/admin/editPlate.html b/src/main/resources/templates/admin/editPlate.html new file mode 100644 index 0000000..ec7c794 --- /dev/null +++ b/src/main/resources/templates/admin/editPlate.html @@ -0,0 +1,44 @@ + + + + + Actualizar Plato + + + + + +

Actualizar Plato

+ +
+ + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/menu.html b/src/main/resources/templates/admin/menu.html new file mode 100644 index 0000000..d3cb5a5 --- /dev/null +++ b/src/main/resources/templates/admin/menu.html @@ -0,0 +1,101 @@ + + + + + Menú de Platos + + + + + + + +

Menú de Platos

+ + +
+ + + +
+ + +
+

Filtrar por Categoría

+
+
+ + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + +
IDNombreDescripciónPrecioAcciones
IDNombreDescripción Precio +
+ + +
+ 		Editar
+ + +
+

Agregar Nuevo Plato

+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/forgotPassword.html b/src/main/resources/templates/forgotPassword.html index 87d732d..697fcda 100644 --- a/src/main/resources/templates/forgotPassword.html +++ b/src/main/resources/templates/forgotPassword.html @@ -25,7 +25,7 @@ > -
- -
- -
- -
- -
- -
-
- +
+

+
diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index de68aec..2d92d50 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -1,5 +1,6 @@ - + + @@ -25,7 +26,7 @@ > -
-
+
+

+
From 57c416bd92f3a15441e9e750f83bac6f32327fba Mon Sep 17 00:00:00 2001 From: ChristianDuarteR Date: Tue, 21 Nov 2023 12:51:37 -0500 Subject: [PATCH 5/9] fixing files --- src/main/resources/templates/admin/admin.html | 3 ++- src/main/resources/templates/admin/editPlate.html | 4 ++-- src/main/resources/templates/admin/menu.html | 4 ++-- src/main/resources/templates/login.html | 6 +++--- src/main/resources/templates/register.html | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/resources/templates/admin/admin.html b/src/main/resources/templates/admin/admin.html index a4f00d3..88f0b83 100644 --- a/src/main/resources/templates/admin/admin.html +++ b/src/main/resources/templates/admin/admin.html @@ -294,6 +294,7 @@

Información del Usuario - +

+
diff --git a/src/main/resources/templates/admin/editPlate.html b/src/main/resources/templates/admin/editPlate.html index 999c7b8..295351a 100644 --- a/src/main/resources/templates/admin/editPlate.html +++ b/src/main/resources/templates/admin/editPlate.html @@ -20,7 +20,7 @@
-
- -
- -
- -
- -
- -
- -
-
-
- -
-
- Forgot password? + Forgot password?
@@ -184,7 +181,7 @@

Login

- - + + diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 59997f7..d4b17ee 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -18,64 +18,61 @@