diff --git a/src/main/java/MTGClone/controller/CardController.java b/src/main/java/MTGClone/controller/CardController.java index 7d8f35b..ee8759c 100644 --- a/src/main/java/MTGClone/controller/CardController.java +++ b/src/main/java/MTGClone/controller/CardController.java @@ -13,7 +13,7 @@ import java.util.ArrayList; @Controller public class CardController { - @GetMapping({"/card"}) + @GetMapping({"/card", "/"}) public String hello(Model model) { ArrayList allCards = (new SQLDriver()).getAllCards(); model.addAttribute("allcards", allCards); diff --git a/src/main/java/MTGClone/controller/HelloController.java b/src/main/java/MTGClone/controller/HelloController.java index d82997a..38bcf1a 100644 --- a/src/main/java/MTGClone/controller/HelloController.java +++ b/src/main/java/MTGClone/controller/HelloController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam; @Controller public class HelloController { - @GetMapping({"/", "/hello"}) + @GetMapping({"/hello"}) public String hello(Model model, @RequestParam(value="name", required=false, defaultValue="World") String name) { model.addAttribute("name", name); return "hello"; diff --git a/src/main/webapp/WEB-INF/jsp/card.jsp b/src/main/webapp/WEB-INF/jsp/card.jsp index ede1d1a..aa4663f 100644 --- a/src/main/webapp/WEB-INF/jsp/card.jsp +++ b/src/main/webapp/WEB-INF/jsp/card.jsp @@ -8,11 +8,18 @@ clear: both; } +td, th{ + padding: 5px 5px 5px 5px; + + } +table, td, th{ + border: 1px solid black; + border-collapse: collapse; +} .container input { width: 100%; clear: both; - } @@ -37,9 +44,11 @@

- - +
+
+ +
@@ -48,20 +57,23 @@ - + + + - +
Card Name Mana CostDescription Creature Type
${listValue.cardName} ${listValue.manaCost} ${listValue.power} ${listValue.toughness} ${listValue.description} ${listValue.creatureType}
+ \ No newline at end of file