small changes

MichalWds · Mar 23, 2019 · 3512d1a · 3512d1a
1 parent 7677541
commit 3512d1a
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 66 deletions.
diff --git a/src/main/java/dictionary_game/model/WordList.java b/src/main/java/dictionary_game/model/WordList.java
@@ -19,7 +19,7 @@ private void addStartDataBase() {
         dictionary.put("spawacz", "welder");
         dictionary.put("operator spawania", "welding operator");
         dictionary.put("spawarka", "welding machine");
-        dictionary.put("spawanie ręczne", "welding process");
+        dictionary.put("spawanie ręczne", "hand welding");
         dictionary.put("spawanie częściowo zmechanizowane", "part mechanized welding");
         dictionary.put("spawanie zmechanizowane", "mechanized welding");
         dictionary.put("spawanie automatyczne", "automatic welding");

diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css
@@ -97,4 +97,31 @@ body{
 .form-col {
     margin-top: 20px;
 }
-/* button for start  */
+
+.centered {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    margin-top: -50px;
+    margin-left: -100px;
+}
+
+.btn-hover {
+    width: 200px;
+    font-size: 16px;
+    font-weight: 600;
+    color: #fff;
+    cursor: pointer;
+    margin: 20px;
+    height: 55px;
+    text-align:center;
+    border: none;
+    background-size: 300% 100%;
+
+    border-radius: 50px;
+    moz-transition: all .4s ease-in-out;
+    -o-transition: all .4s ease-in-out;
+    -webkit-transition: all .4s ease-in-out;
+    transition: all .4s ease-in-out;
+}
+/*      BUTTON        */
diff --git a/src/main/resources/templates/form.html b/src/main/resources/templates/form.html
@@ -3,26 +3,31 @@
 <head th:replace="/players :: head"></head>
     <meta charset="UTF-8">
     <title>WriteYourName</title>
-
+<style>
+    h1 {color: crimson}
+</style>
 </head>
 <body>
 <div class="background-roundone">
-    <div style="background-color: rgba(0, 0, 255, 0.7);padding:20px;width:1000px; margin-left:100px;">
+    <div style="background-color: rgba(100, 0, 400, 0.3);padding:200px;width: 50%; margin-left:100px; content: '50';">
 
 <form th:action="@{/home}" th:object="${user}" method="post">
     <input type="hidden" th:field="*{id}">
-    <!-- -->
-
+    <div align="center">
+    <h1>Podaj imię:</h1>
+<br>
     <table>
         <tr>
-            <td>Podaj imię:</td>
             <td><input type="text" th:field="*{name}" /></td>
             <td th:if="${#fields.hasErrors('name')}" th:errors="*{name}">Name Error</td>
         </tr>
-        <tr>
-            <td><button type="submit">Graj</button></td>
-        </tr>
+            <tr >
+
+            <td><button class="btn btn-primary btn-lg" type="submit">Graj</button></td>
+            </tr>
     </table>
+        </br>
+    </div>
 </form>
     </div>
 

diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
@@ -1,13 +1,16 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head th:replace="/players :: head"></head>
-<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Roboto:400"/>
+
+<style>
+h1 { color: #FF0000; }
+</style>
 </head>
 <body>
 <div class="background-welder">
 
 <div style="text-align: center;vertical-align: center;padding-top:150px;">
-    <h3>Rozpocznij Grę!</h3>
+    <h1> Rozpocznij Grę!</h1>
 
 <form>
     <a align="center" th:href="@{/add}">
@@ -16,7 +19,6 @@ <h3>Rozpocznij Grę!</h3>
 </form>
 
 
-
 </div>
 </div>
 </body>

diff --git a/src/main/resources/templates/roundone.html b/src/main/resources/templates/roundone.html
@@ -5,40 +5,41 @@
 <body>
 <div class="background-roundone">
     <div style="background-color: rgba(0, 0, 255, 0.7);padding:20px;width:1000px; margin-left:100px;">
-<h2>Podaj tłumaczenie słowa: </h2>
+<h1>Podaj tłumaczenie słowa: </h1>
 <form accept="/roundone">
-    <p th:text="${englishW}"></p>
-    <label>Przetłumacz</label>
-
+    <h2><p th:text="${englishW}"></p></h2>
+    <label><h3>Przetłumacz</h3></label>
     <input type="text" name="name">
     <input type="submit" value="Następne">
 
+
     <div th:if="${point > 1 }">
         <a th:href="@{/r2}">
-            <button type="button">Idź dalej</button>
+            <button type="button" class="btn btn-primary btn-lg">Idź dalej</button>
         </a></div>
-    <div th:text="${answer}"></div>
+    <br>
+    <h6> <div th:text="${answer}"></div></h6>
+       </br>
 </form>
-    <form>
-
-    </form>
 
     <form action="/help">
         <h3 th align="center" th:accept="${polishW}">
 
 
-            <input type="hidden" th:value="${polishW}" name="Podpowiedz"/>
-            Podpowiedź
-            <input value="tak" type="submit">
+
+            Utrwal
+            <input value="Przejdź" type="submit">
         </h3>
     </form>
     <form>
-        <select name="submit">
-            <option value=1>Podpowiedź</option>
-            <option value="0"><p th:text="${polishW}"</p></option>
-        </select>
+        <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                Podpowiedź <span class="caret"></span></button>
+            <ul class="dropdown-menu" role="menu">
+                <li><a th:text="${polishW}">PL</a></li>
+            </ul>
+        </div>
 
-        </h3>
     </form>
 </div>
 </div>

diff --git a/src/main/resources/templates/roundthree.html b/src/main/resources/templates/roundthree.html
@@ -2,49 +2,71 @@
 <html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head th:replace="/players :: head"></head>
 <div class="background-roundthree">
-    <div style="background-color: rgba(0, 0, 255, 0.7);padding:20px;width:1000px; margin-left:100px;">
+    <div style="background-color: rgba(0, 0, 255, 0.7);padding:20px;width:1100px; margin-left:100px;">
     <meta charset="UTF-8">
     <title>Gra Słowna</title>
 </head>
 <body>
-<h2>Uzupełnij brakujące znaki i wpisz poprawnie całe słowo </h2>
-<form accept="/roundthree">  <!-- po wykonaniu akcji, wraca do result-->
-    <p th:text="${hashWord}"></p>
-    <label>Przetłumacz</label>
+<h1>Uzupełnij brakujące znaki i wpisz poprawnie całe słowo. </h1>
+<form accept="/roundthree">
+    <h2> <p th:text="${hashWord}"></p></h2>
+    <label><h3>Przepisz: </h3></label>
 
     <input type="text" name="name3">
     <input type="submit" value="Następne">
+
+
+</form>
+<br>
+
+</br>
+
+<form>
+
+
     <form>
+        <br>
         <div th:if="${point3 > 3 }">
             <a th:href="@{/r2}">
-                <button type="button">Wróć do rundy 2</button>
-            </a></div>
+                <button class="btn btn-primary btn-lg" type="button">Wróć do rundy 2</button>
+            </a>
+        </div>
+    </br>
     </form>
 
     <form>
+
         <div th:if="${point3 > 3 }">
             <a th:href="@{/r1}">
-                <button type="button">Wróć do rundy 1</button>
+                <button class="btn btn-primary btn-lg" type="button">Wróć do rundy 1</button>
             </a></div>
-    </form>
-
-    <div th:text="${answer3}"></div>
-
-
-    <form>
-        <select name="submit">
-        <option value=1>Podpowiedź PL</option>
-        <option value="0"><p th:text="${polishW}"</p></option>
-    </select>
-        <select name="submit">
-            <option value=1>Podpowiedź ANG</option>
-            <option value="0"><p th:text="${englishW}"</p></option>
-        </select>
+<table><td>
+    <br>
+        <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                Podpowiedź PL <span class="caret"></span></button>
+            <ul class="dropdown-menu" role="menu">
+                <li><a th:text="${polishW}">PL</a></li>
+            </ul>
+        </div></td>
+    </br>
+<tr>
+       <div class="btn-group">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                Podpowiedź ENG<span class="caret"></span></button>
+            <ul class="dropdown-menu" role="menu">
+                <li><a th:text="${englishW}">ENG</a></li>
+            </ul>
+        </div>
+    </tr>
+</table>
+        <br>
         <div th:if="${point3 > 0 }">
             <a th:href="@{/score}">
-                <button type="button">Zakończ grę</button>
+                <button  class="btn btn-primary btn-lg" type="button">Zakończ grę</button>
             </a></div>
-        </h3>
+        </br>
+
     </form>
 
 </form>

diff --git a/src/main/resources/templates/roundtwo.html b/src/main/resources/templates/roundtwo.html
@@ -7,24 +7,26 @@
     <title>Gra Słowna</title>
 </head>
 <body>
-<h2>Podaj tłumaczenie słowa: </h2>
+<h1>Podaj tłumaczenie słowa: </h1>
 <form accept="/roundtwo">  <!-- po wykonaniu akcji, wraca do result-->
-    <p th:text="${polishW}"></p>
-    <label>Przetłumacz</label>
+    <h2> <p th:text="${polishW}"></p></h2>
+    <label><h3>Przetłumacz</h3></label>
 
     <input type="text" name="name2">
     <input type="submit" value="Następne">
 <form>
     <div th:if="${point2 > 4 }">
         <a th:href="@{/r3}">
-            <button type="button">Idź dalej</button>
+            <button class="btn btn-primary btn-lg" type="button">Idź dalej</button>
         </a></div>
-</form>
+</form><br>
     <div th:if="${point2 > 2 }">
         <a th:href="@{/r1}">
-            <button type="button">Wróć do rundy 1</button>
-        </a></div>
-    <div th:text="${answer2}"></div>
+            <button class="btn btn-primary btn-lg" type="button">Wróć do rundy 1</button>
+        </a></div></br>
+    <br>
+   <h6> <div th:text="${answer2}"></div></h6>
+    </br>
 </form>
 
 </form>
@@ -39,10 +41,14 @@ <h3 th align="center" th:accept="${englishW}">
     </h3>
 </form>
 <form>
-    <select name="submit">
-        <option value=1>Podpowiedź</option>
-        <option value="0"><p th:text="${englishW}"</p></option>
-    </select>
+    <div class="btn-group">
+        <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+            Podpowiedź <span class="caret"></span></button>
+        <ul class="dropdown-menu" role="menu">
+            <li><a th:text="${englishW}">ENG</a></li>
+
+        </ul>
+    </div>
 
     </h3>
 </form>