From e372b9487baa07f611bb71a185be1bbcab863929 Mon Sep 17 00:00:00 2001 From: Juanjo Date: Fri, 10 Feb 2023 23:44:30 +0100 Subject: [PATCH] menu --- .../controladores/WebControlador.java | 6 + src/main/resources/templates/buscar.html | 3 +- .../resources/templates/editar_usuario.html | 3 +- src/main/resources/templates/head/head.html | 5 + src/main/resources/templates/inicio.html | 150 +++++++++++++++++- src/main/resources/templates/menu/m1.html | 12 +- .../resources/templates/nuevo_usuario.html | 3 +- src/main/resources/templates/opcionales.html | 3 +- src/main/resources/templates/parametros.html | 3 +- src/main/resources/templates/usuarios.html | 3 +- 10 files changed, 172 insertions(+), 19 deletions(-) diff --git a/src/main/java/es/fp/edu/conecta2/controladores/WebControlador.java b/src/main/java/es/fp/edu/conecta2/controladores/WebControlador.java index 30ac75f..58afef0 100644 --- a/src/main/java/es/fp/edu/conecta2/controladores/WebControlador.java +++ b/src/main/java/es/fp/edu/conecta2/controladores/WebControlador.java @@ -13,7 +13,13 @@ public class WebControlador { @Autowired private UserService servicioUser; + @GetMapping ("/") + public String inicio(Model modelo){ + + return "inicio"; + } + @GetMapping ("/listado") public String listarUser(Model modelo){ modelo.addAttribute("user",servicioUser.listarUser()); return "usuarios"; diff --git a/src/main/resources/templates/buscar.html b/src/main/resources/templates/buscar.html index d09fa70..96bed89 100644 --- a/src/main/resources/templates/buscar.html +++ b/src/main/resources/templates/buscar.html @@ -1,7 +1,8 @@ + xmlns:th="http://www.thymeleaf.org" + xmlns:sec="http://www.thymeleaf.org/extras/spring-security"> diff --git a/src/main/resources/templates/editar_usuario.html b/src/main/resources/templates/editar_usuario.html index 8586159..a1d71e1 100644 --- a/src/main/resources/templates/editar_usuario.html +++ b/src/main/resources/templates/editar_usuario.html @@ -1,7 +1,8 @@ + xmlns:th="http://www.thymeleaf.org" + xmlns:sec="http://www.thymeleaf.org/extras/spring-security"> diff --git a/src/main/resources/templates/head/head.html b/src/main/resources/templates/head/head.html index 075715a..5554e55 100644 --- a/src/main/resources/templates/head/head.html +++ b/src/main/resources/templates/head/head.html @@ -6,6 +6,8 @@ + + diff --git a/src/main/resources/templates/inicio.html b/src/main/resources/templates/inicio.html index 5eae302..b183a5d 100644 --- a/src/main/resources/templates/inicio.html +++ b/src/main/resources/templates/inicio.html @@ -1,11 +1,155 @@ + xmlns:th="http://www.thymeleaf.org" + xmlns:sec="http://www.thymeleaf.org/extras/spring-security"> -Hola mundo - +
+
+
+
+
+ +
+

Pricing

+ +
+ + +
+ +
+ + +
+ + +
+ +
+

Free

+
Free
+
+ +
+
    +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
+
+ +
+ +
+ +
+ + +
+ + + +
+ + +
+ +
+

Essential

+
$19/month
+
+ +
+
    +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
+
+ +
+ +
+ +
+ + +
+ + + +
+ + +
+ +
+

Advanced

+
$49/month
+
+ +
+
    +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
+
+ +
+ +
+ +
+ + +
+ + + +
+ + +
+ +
+

Enterprise

+
$189/month
+
+ +
+
    +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
  • Feature
    • +
+
+ +
+ +
+ +
+ + +
+ + +
+
+ +
+
\ No newline at end of file diff --git a/src/main/resources/templates/menu/m1.html b/src/main/resources/templates/menu/m1.html index e78b735..39bcb5f 100644 --- a/src/main/resources/templates/menu/m1.html +++ b/src/main/resources/templates/menu/m1.html @@ -1,10 +1,3 @@ - - - - - - - - \ No newline at end of file + diff --git a/src/main/resources/templates/nuevo_usuario.html b/src/main/resources/templates/nuevo_usuario.html index b0fbced..afe774c 100644 --- a/src/main/resources/templates/nuevo_usuario.html +++ b/src/main/resources/templates/nuevo_usuario.html @@ -1,7 +1,8 @@ + xmlns:th="http://www.thymeleaf.org" + xmlns:sec="http://www.thymeleaf.org/extras/spring-security"> diff --git a/src/main/resources/templates/opcionales.html b/src/main/resources/templates/opcionales.html index cdbf8e2..f3aeaa3 100644 --- a/src/main/resources/templates/opcionales.html +++ b/src/main/resources/templates/opcionales.html @@ -1,7 +1,8 @@ + xmlns:th="http://www.thymeleaf.org" + xmlns:sec="http://www.thymeleaf.org/extras/spring-security"> Parámetros opcionales: diff --git a/src/main/resources/templates/parametros.html b/src/main/resources/templates/parametros.html index d0e0ed3..df1ef46 100644 --- a/src/main/resources/templates/parametros.html +++ b/src/main/resources/templates/parametros.html @@ -1,7 +1,8 @@ + xmlns:th="http://www.thymeleaf.org" + xmlns:sec="http://www.thymeleaf.org/extras/spring-security"> Parámetros: diff --git a/src/main/resources/templates/usuarios.html b/src/main/resources/templates/usuarios.html index 21fe5b8..6a382c8 100644 --- a/src/main/resources/templates/usuarios.html +++ b/src/main/resources/templates/usuarios.html @@ -1,7 +1,8 @@ + xmlns:th="http://www.thymeleaf.org" + xmlns:sec="http://www.thymeleaf.org/extras/spring-security">