diff --git a/out/production/resources/static.rar b/out/production/resources/static.rar new file mode 100644 index 0000000..e69de29 diff --git a/out/production/resources/static/css/bootstrap.css b/out/production/resources/static/css/bootstrap.css new file mode 100644 index 0000000..37bdd69 --- /dev/null +++ b/out/production/resources/static/css/bootstrap.css @@ -0,0 +1,133 @@ + h1 { + text-shadow: 0 0 3px #FF0000; + + } + + h2 { + color: maroon; + margin-left: 40px; + + } + + h3 { + color: maroon; + margin-left: 40px; + + } + h4{ + color: #F072A9; + font-weight: bold; + font-size: 35px; + text-shadow: 1px 1px 1px #fff; + } +body { + background-repeat: no-repeat; + background-size:cover; +} + #example1 { + background-image: linear-gradient(to right, red,orange,yellow,green,blue,indigo,violet); + position:fixed; + padding:0; + margin:0; + top:0; + left:0; + width: 100%; + height: 100%; + } + + #form-style-3{ + width: 50%; + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; + border-radius: 10px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border: 1px solid #FFD2D2; + padding: 20px; + box-shadow: inset 0px 0px 15px #FFE5E5; + -moz-box-shadow: inset 0px 0px 15px #FFE5E5; + -webkit-box-shadow: inset 0px 0px 15px #FFE5E5; + margin: auto; + display: table; + } + #form-style-3 label{ + display:block; + margin-bottom: 10px; + } + #form-style-3 label > span{ + float: left; + width: 100px; + color: #F072A9; + font-weight: bold; + font-size: 13px; + text-shadow: 1px 1px 1px #fff; + } + #form-style-3 fieldset{ + border-radius: 10px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + margin: 0px 0px 10px 0px; + border: 1px solid #FFD2D2; + padding: 20px; + background: #FFF4F4; + box-shadow: inset 0px 0px 15px #FFE5E5; + -moz-box-shadow: inset 0px 0px 15px #FFE5E5; + -webkit-box-shadow: inset 0px 0px 15px #FFE5E5; + } + #form-style-3 fieldset legend{ + color: #FFA0C9; + border-top: 1px solid #FFD2D2; + border-left: 1px solid #FFD2D2; + border-right: 1px solid #FFD2D2; + border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + background: #FFF4F4; + padding: 0px 8px 3px 8px; + box-shadow: -0px -1px 2px #F1F1F1; + -moz-box-shadow:-0px -1px 2px #F1F1F1; + -webkit-box-shadow:-0px -1px 2px #F1F1F1; + font-weight: normal; + font-size: 12px; + } + #form-style-3 textarea{ + width:250px; + height:100px; + } + #form-style-3 input[type=text], + #form-style-3 input[type=date], + #form-style-3 input[type=datetime], + #form-style-3 input[type=number], + #form-style-3 input[type=search], + #form-style-3 input[type=time], + #form-style-3 input[type=url], + #form-style-3 input[type=email], + #form-style-3 select, + #form-style-3 textarea{ + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border: 1px solid #FFC2DC; + outline: none; + color: #F072A9; + padding: 5px 8px 5px 8px; + box-shadow: inset 1px 1px 4px #FFD5E7; + -moz-box-shadow: inset 1px 1px 4px #FFD5E7; + -webkit-box-shadow: inset 1px 1px 4px #FFD5E7; + background: #FFEFF6; + width:50%; + } + #form-style-3 input[type=submit], + #form-style-3 input[type=button]{ + background: #EB3B88; + border: 1px solid #C94A81; + padding: 5px 15px 5px 15px; + color: #FFCBE2; + box-shadow: inset -1px -1px 3px #FF62A7; + -moz-box-shadow: inset -1px -1px 3px #FF62A7; + -webkit-box-shadow: inset -1px -1px 3px #FF62A7; + border-radius: 3px; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + font-weight: bold; + } diff --git a/out/production/resources/static/fonts/glyphicons-halflings-regular.eot b/out/production/resources/static/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/out/production/resources/static/fonts/glyphicons-halflings-regular.eot differ diff --git a/out/production/resources/static/fonts/glyphicons-halflings-regular.svg b/out/production/resources/static/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..94fb549 --- /dev/null +++ b/out/production/resources/static/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/resources/static/fonts/glyphicons-halflings-regular.ttf b/out/production/resources/static/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/out/production/resources/static/fonts/glyphicons-halflings-regular.ttf differ diff --git a/out/production/resources/static/fonts/glyphicons-halflings-regular.woff b/out/production/resources/static/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/out/production/resources/static/fonts/glyphicons-halflings-regular.woff differ diff --git a/out/production/resources/static/fonts/glyphicons-halflings-regular.woff2 b/out/production/resources/static/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/out/production/resources/static/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/src/main/resources/static.rar b/src/main/resources/static.rar new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/static/css/bootstrap.css b/src/main/resources/static/css/bootstrap.css new file mode 100644 index 0000000..37bdd69 --- /dev/null +++ b/src/main/resources/static/css/bootstrap.css @@ -0,0 +1,133 @@ + h1 { + text-shadow: 0 0 3px #FF0000; + + } + + h2 { + color: maroon; + margin-left: 40px; + + } + + h3 { + color: maroon; + margin-left: 40px; + + } + h4{ + color: #F072A9; + font-weight: bold; + font-size: 35px; + text-shadow: 1px 1px 1px #fff; + } +body { + background-repeat: no-repeat; + background-size:cover; +} + #example1 { + background-image: linear-gradient(to right, red,orange,yellow,green,blue,indigo,violet); + position:fixed; + padding:0; + margin:0; + top:0; + left:0; + width: 100%; + height: 100%; + } + + #form-style-3{ + width: 50%; + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; + border-radius: 10px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border: 1px solid #FFD2D2; + padding: 20px; + box-shadow: inset 0px 0px 15px #FFE5E5; + -moz-box-shadow: inset 0px 0px 15px #FFE5E5; + -webkit-box-shadow: inset 0px 0px 15px #FFE5E5; + margin: auto; + display: table; + } + #form-style-3 label{ + display:block; + margin-bottom: 10px; + } + #form-style-3 label > span{ + float: left; + width: 100px; + color: #F072A9; + font-weight: bold; + font-size: 13px; + text-shadow: 1px 1px 1px #fff; + } + #form-style-3 fieldset{ + border-radius: 10px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + margin: 0px 0px 10px 0px; + border: 1px solid #FFD2D2; + padding: 20px; + background: #FFF4F4; + box-shadow: inset 0px 0px 15px #FFE5E5; + -moz-box-shadow: inset 0px 0px 15px #FFE5E5; + -webkit-box-shadow: inset 0px 0px 15px #FFE5E5; + } + #form-style-3 fieldset legend{ + color: #FFA0C9; + border-top: 1px solid #FFD2D2; + border-left: 1px solid #FFD2D2; + border-right: 1px solid #FFD2D2; + border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + background: #FFF4F4; + padding: 0px 8px 3px 8px; + box-shadow: -0px -1px 2px #F1F1F1; + -moz-box-shadow:-0px -1px 2px #F1F1F1; + -webkit-box-shadow:-0px -1px 2px #F1F1F1; + font-weight: normal; + font-size: 12px; + } + #form-style-3 textarea{ + width:250px; + height:100px; + } + #form-style-3 input[type=text], + #form-style-3 input[type=date], + #form-style-3 input[type=datetime], + #form-style-3 input[type=number], + #form-style-3 input[type=search], + #form-style-3 input[type=time], + #form-style-3 input[type=url], + #form-style-3 input[type=email], + #form-style-3 select, + #form-style-3 textarea{ + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border: 1px solid #FFC2DC; + outline: none; + color: #F072A9; + padding: 5px 8px 5px 8px; + box-shadow: inset 1px 1px 4px #FFD5E7; + -moz-box-shadow: inset 1px 1px 4px #FFD5E7; + -webkit-box-shadow: inset 1px 1px 4px #FFD5E7; + background: #FFEFF6; + width:50%; + } + #form-style-3 input[type=submit], + #form-style-3 input[type=button]{ + background: #EB3B88; + border: 1px solid #C94A81; + padding: 5px 15px 5px 15px; + color: #FFCBE2; + box-shadow: inset -1px -1px 3px #FF62A7; + -moz-box-shadow: inset -1px -1px 3px #FF62A7; + -webkit-box-shadow: inset -1px -1px 3px #FF62A7; + border-radius: 3px; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + font-weight: bold; + } diff --git a/src/main/resources/static/fonts/glyphicons-halflings-regular.eot b/src/main/resources/static/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/src/main/resources/static/fonts/glyphicons-halflings-regular.eot differ diff --git a/src/main/resources/static/fonts/glyphicons-halflings-regular.svg b/src/main/resources/static/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..94fb549 --- /dev/null +++ b/src/main/resources/static/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf b/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf differ diff --git a/src/main/resources/static/fonts/glyphicons-halflings-regular.woff b/src/main/resources/static/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/src/main/resources/static/fonts/glyphicons-halflings-regular.woff differ diff --git a/src/main/resources/static/fonts/glyphicons-halflings-regular.woff2 b/src/main/resources/static/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/src/main/resources/static/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/src/main/webapp/WEB-INF/jsp/Theorem.jsp b/src/main/webapp/WEB-INF/jsp/Theorem.jsp index a674c36..61c1921 100644 --- a/src/main/webapp/WEB-INF/jsp/Theorem.jsp +++ b/src/main/webapp/WEB-INF/jsp/Theorem.jsp @@ -2,32 +2,35 @@ pageEncoding="UTF-8"%> - +
Theorem Page +

Enter Theorem Details

+ - -
-Enter Theorem Name : -
Enter Theorem:
- -
- +

+ Theorem Entry + +
+
-


+
+
- + +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index a31785b..fc13988 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -10,18 +10,22 @@ <%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" %> + Pandamonium™ Theorem Prover + - -
-
+ +
+

Theorem Prover

Hello! Welcome to Pandamonium™ Theorem Prover!!

- - Click on this link to visit theorem entering page. -
+

+ Click on this link to visit theorem entering page. +

+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/success.jsp b/src/main/webapp/WEB-INF/jsp/success.jsp index 4a09232..4cfea12 100644 --- a/src/main/webapp/WEB-INF/jsp/success.jsp +++ b/src/main/webapp/WEB-INF/jsp/success.jsp @@ -1,7 +1,19 @@ +
+ + + -
Name: <%= request.getParameter("theoremName")%> +
+

Theorem List

+
+
+


Name: <%= request.getParameter("theoremName")%>
Theorem: <%= request.getParameter("theorem")%> - +

+
+
+
+
\ No newline at end of file diff --git a/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java b/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java index 860bff9..403e1ec 100644 --- a/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java +++ b/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java @@ -17,11 +17,10 @@ public class TheoremEntryControllerTest { @Test public void saveTheorem(){ - final ModelAndView modelAndView= theoremEntryController.enterTheoremPage(); + ModelAndView modelAndView= theoremEntryController.enterTheoremPage(); - @Test - public void testEnterTheoremPage() { - final ModelAndView modelAndView = theoremEntryController.enterTheoremPage(); + public void testEnterTheoremPage() { + modelAndView = theoremEntryController.enterTheoremPage(); assertNotNull(modelAndView);