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

Merge pull request #6 from jordanmason-stleo/master 

Updates from Jordan
pull/6/head
Gregory Rudolph 4 years ago committed by GitHub
parent
d0d96b959c 9c70671e82
commit
999eabfbfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/java/MTGClone/controller/CardController.java
  2. 79
      src/main/webapp/WEB-INF/jsp/card.jsp

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

@ -21,6 +21,8 @@ public class CardController { @@ -21,6 +21,8 @@ public class CardController {
return "card";
}
@PostMapping({"/card"})
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,

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

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

Write Preview
Loading…
Cancel
Save