rudi/MTGClone
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #6 from jordanmason-stleo/master

Browse Source 
Updates from Jordan
This commit is contained in:
Gregory Rudolph
2020-09-30 12:01:10 -04:00
committed by GitHub
parent d0d96b959c 9c70671e82
commit 999eabfbfb
2 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/MTGClone/controller/CardController.java
View File

@ -21,6 +21,8 @@ public class CardController {
return "card"; return "card";
} }
@PostMapping({"/card"}) @PostMapping({"/card"})
public String greet(@RequestParam("cardname") String cardname, @RequestParam("manacost") int manacost, public String greet(@RequestParam("cardname") String cardname, @RequestParam("manacost") int manacost,
@RequestParam("power") int power, @RequestParam("toughness") int toughness, @RequestParam("description") String description, @RequestParam("creaturetype") String creaturetype, @RequestParam("power") int power, @RequestParam("toughness") int toughness, @RequestParam("description") String description, @RequestParam("creaturetype") String creaturetype,

73
src/main/webapp/WEB-INF/jsp/card.jsp
View File

@ -2,10 +2,12 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html lang="en"> <html lang="en">
<head> <head>
<link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet">
<style> <style>
.container { .container {
width: 350px; background-color:#4F4F4F;
clear: both; border-radius:15px;
width:1885px;
} }
td, th{ td, th{
@ -13,45 +15,58 @@ td, th{
} }
table, td, th{ table, td, th{
border: 1px solid black; border: 3px solid #CFCACA;
border-collapse: collapse; border-collapse: collapse;
} width: 1885px;
.container input { font-size: 26px;
width: 100%; color: #CFCACA;
clear: both;
}
.container label {
position: relative;font-size:20px;
}
.container input, textarea{
background-color:#CFCACA;position:relative;border-radius:5px;font-size:20px;
} }
</style> </style>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Hello ${name}!</title> <title>Hello ${name}!</title>
</head> </head>
<body> <body style="background-color:#0F0F0F;font-family: 'Ubuntu', sans-serif;">
<h2 class="hello-title">Hello ${name}!</h2> <li><a href="/login" style="color:#C10E0E">Login / Sign Up</a></li> </ul>
<h2 style="color:#CFCACA;position:relative;left:820px;">Magic Card Creator</h2>
<div class="container"> <div class="container">
<form action="/card" method="post"> <form action="/card" method="post">
<label for="cardname">Card Name:</label> <br><br><label style="left:210px;font-size:26px;"for="cardname">Card Name:</label>
<input type="text" id="cardname" name="cardname"><br> <input style="left:210px;font-size:24px;width:300px;"placeholder="Card Title"type="text" id="cardname" name="cardname"><br><br>
<label for="manacost">Mana Cost:</label> <label style="left:150px;"for="manacost">Mana Cost:</label>
<input type="text" id="manacost" name="manacost"><br> <input style="left:150px;"type="text" id="manacost" name="manacost">
<label for="power">Power:</label> <label style="left:250px;"for="power">Power:</label>
<input type="text" id="power" name="power"><br> <input style="left:250px;"type="text" id="power" name="power">
<label for="toughness">Toughness:</label> <label style="left:350px;"for="toughness">Toughness:</label>
<input type="text" id="toughness" name="toughness"><br> <input style="left:350px;"type="text" id="toughness"name="toughness">
<label for="description">Description:</label> <label style="left:450px;"for="creaturetype">Spell Type:</label>
<input type="text" id="description" name="description"><br> <select style="background-color:#CFCACA;position:relative;border-radius:4px;left:450px;font-size:20px;width:250px;"id="creaturetype"name="creaturetype">
<label for="creaturetype">Creature Type:</label> <option value="Evocation">Evocation</option>
<input type="text" id="creaturetype" name="creaturetype"><br> <option value="Ward">Ward</option>
<label for="username">Username:</label> <option value="Curse">Curse</option>
<input type="text" id="username" name="username"><br> </select>
<label for="password">Password:</label> <br><br>
<input type="password" id="password" name="password"><br> <label style="vertical-align:middle;left:145px;"for="description">Description:</label>
<textarea style="border-radius:5px;vertical-align:middle;left:145px;font-size:18px;width:658px;height:120px;"placeholder="Flavor text, etc."type="text" id="description" name="description"></textarea>
<br> <input style="width:30%;display:block;margin:0 auto;" type="submit" value="Submit"> <label style="left:245px;font-size:14px;"for="username">Username:</label>
<input style="left:245px;font-size:14px;"type="text" id="username" name="username">
<label style="left:300px;font-size:14px;"for="password">Password:</label>
<input style="left:300px;font-size:14px;"type="password" id="password" name="password"><br>
<br> <input style="height:40px;width:15%;display:block;margin:0 auto;" type="submit" value="Submit"><br><br>
</form> </form>
</div> </div>
<br> <br>
<br>
<table style> <table style>
<tr> <tr>
@ -59,8 +74,8 @@ table, td, th{
<th>Mana Cost</th> <th>Mana Cost</th>
<th>Power</th> <th>Power</th>
<th>Toughness</th> <th>Toughness</th>
<th>Spell Type</th>
<th>Description</th> <th>Description</th>
<th>Creature Type</th>
</tr> </tr>
<c:if test="${not empty allcards}"> <c:if test="${not empty allcards}">
@ -71,8 +86,8 @@ table, td, th{
<td>${listValue.manaCost}</td> <td>${listValue.manaCost}</td>
<td>${listValue.power}</td> <td>${listValue.power}</td>
<td>${listValue.toughness}</td> <td>${listValue.toughness}</td>
<td>${listValue.description}</td>
<td>${listValue.creatureType}</td> <td>${listValue.creatureType}</td>
<td>${listValue.description}</td>
</tr> </tr>
</c:forEach> </c:forEach>