Skip to content

Manuel Ruiz Fernández / freemarker

Go to a project
Commit db0ed2bd by mrf00020
Options

Merge remote-tracking branch 'origin/Fran' into Fran 

# Conflicts:
#	src/main/java/com/example/FreeMarket/controller/SalasController.java
#	src/main/resources/templates/index.ftl
parents d3839926 ecb11fb5
Inline Side-by-side
Showing with 48 additions and 4 deletions
pom.xml
......@@ -38,7 +38,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
......@@ -47,5 +46,4 @@
</plugin>
</plugins>
</build>
</project>
src/main/java/com/example/FreeMarket/FreeMarketApplication.java
......@@ -21,6 +21,5 @@ public class FreeMarketApplication implements CommandLineRunner {
@Override
public void run(String...args) throws Exception {
}
}
src/main/java/com/example/FreeMarket/controller/SalasController.java
......@@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
......@@ -20,7 +22,19 @@ public class SalasController {
private SalaRepository salaRepository;
@GetMapping("/")
public String index(Model model) {
public String mostrarFormulario(Model modelo) {
modelo.addAttribute("titulo", "Página de Bienvenida");
return "bienvenida";
}
@PostMapping("/")
public String procesarFormulario(@RequestParam("nombre") String nombre, Model modelo) {
modelo.addAttribute("titulo", "Página de Bienvenida");
modelo.addAttribute("nombre", nombre);
return "bienvenida";
}
@GetMapping("/index")
public String index(Model model) {
return "index";
}
......
src/main/java/com/example/FreeMarket/model/Sala.java
......@@ -20,6 +20,13 @@ public class Sala {
this.tamano = tamano;
}
public Sala(Sala sala) {
this.id = sala.id;
this.descripcion = sala.descripcion;
this.ubicacion = sala.ubicacion;
this.tamano = sala.tamano;
}
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
public Integer getId() {
......
src/main/resources/templates/bienvenida.ftl 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Bienvenido</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
crossorigin="anonymous">
</head>
<body>
<h1>¡Bienvenido!</h1>
<#if nombre?has_content>
<p>Hola ${nombre}, gracias por visitar nuestra página.</p>
<a href="index" class="btn btn-outline-primary"> Pagina principal</a>
<#else>
<form action="/" method="post">
<label for="nombre">Ingresa tu nombre:</label>
<input type="text" name="nombre" id="nombre">
<button type="submit" class="w-90 btn btn-lg btn-primary btn-sm">Enviar</button>
</form>
</#if>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment