Commit 60733e8c by Patryk Czarnik

Przenieniesie szablonów jsp do WEB-INF

parent 9fb49957
...@@ -25,14 +25,14 @@ public class AlternatywneProdukty2 { ...@@ -25,14 +25,14 @@ public class AlternatywneProdukty2 {
TypedQuery<Product> query = em.createNamedQuery("Product.findAll", Product.class); TypedQuery<Product> query = em.createNamedQuery("Product.findAll", Product.class);
List<Product> products = query.getResultList(); List<Product> products = query.getResultList();
model.addAttribute("products", products); model.addAttribute("products", products);
return "/products.jsp"; return "/WEB-INF/templates/products.jsp";
} }
@GetMapping("/products/{id}") @GetMapping("/products/{id}")
public String oneProduct(Model model, @PathVariable int id) { public String oneProduct(Model model, @PathVariable int id) {
Product product = em.find(Product.class, id); Product product = em.find(Product.class, id);
model.addAttribute("product", product); model.addAttribute("product", product);
return "/product.jsp"; return "/WEB-INF/templates/product.jsp";
} }
} }
...@@ -12,7 +12,7 @@ public class RootController { ...@@ -12,7 +12,7 @@ public class RootController {
@RequestMapping("/") @RequestMapping("/")
public String index() { public String index() {
return "index.jsp"; return "/WEB-INF/templates/index.jsp";
} }
@RequestMapping("/hello") @RequestMapping("/hello")
...@@ -25,8 +25,9 @@ public class RootController { ...@@ -25,8 +25,9 @@ public class RootController {
public String ktoraGodzina(Model model) { public String ktoraGodzina(Model model) {
LocalDateTime dt = LocalDateTime.now(); LocalDateTime dt = LocalDateTime.now();
model.addAttribute("dt", dt); model.addAttribute("dt", dt);
return "pokaz_czas.jsp"; return "/WEB-INF/templates/pokaz_czas.jsp";
// Pliki JSP umieszczamy w projekcie w src/main/webapp a nie w templates // Pliki JSP umieszczamy w projekcie w src/main/webapp a nie w templates
// Tu docelowo będzie to /WEB-INF/templates :-)
} }
} }
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="product"> <div class="product">
<p>Towar <a href="products/${product.productId}" class="product-name">${product.productName}</a></p> <p>Towar <a href="products/${product.productId}" class="product-name">${product.productName}</a></p>
<p>Cena: <span class="product-price">${product.price}</span></p> <p>Cena: <span class="product-price">${product.price}</span></p>
<p>${product.description}</p> <p class="product-description">${product.description}</p>
</div> </div>
</c:forEach> </c:forEach>
......
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 to comment