Merge branch 'devHelp' of https://github.com/rainestormee/hack-the-mi…

…dlands into devHelp
rainestormee · Oct 25, 2020 · fa762a9 · fa762a9
2 parents 67d94c9 + 4c5cfc0
commit fa762a9
Showing 1 changed file with 14 additions and 40 deletions.
diff --git a/src/main/resources/templates/orders-view-volunteer.html b/src/main/resources/templates/orders-view-volunteer.html
@@ -15,65 +15,39 @@
         left: 90%;
     }
     .orderClass{
-        margin-left: 130px;
-        margin-right: 130px;
-        margin-bottom: 10px;
         text-align: center;
+        width: 20%;
         border: solid;
         border-radius: 20px;
         border-color: #336699;
+    }
+    .placeOrder{
         font-size: 18px;
     }
 
     .selected{
         border-color: green;
     }
-
-    .waitingOrders{
-        float: left;
-        width: 50%;
-    }
-
-    .commitedOrders{
-        float: right;
-        width: 50%;
-    }
 </style>
 
 <body>
+<h2>Welcome back to the volunteer page !</h2>
 <div class="setts">
     <input id="set" onclick="location.href = '/settings'" type="submit" value="Settings">
     <input id = "logout" onclick = "location.href = '/dev/logout'" type = "submit" value = "Logout">
 </div>
 
-<h2>Welcome back to the volunteer page !</h2>
-<div class="actions">
-    <div class="waitingOrders">
-        <h3>Available orders:</h3><br><br>
-        <div class = "orderClass" th:each="order: ${orders}">
-            <b><p th:text="${'Submitted by: ' + order.user.firstname + ' ' + order.user.lastname}"> </p></b>
-            <p th:text="${'Postcode: ' + order.user.postcode}"></p>
-            <div class = "items"> Items:
-            <div th:each="item: ${order.shopList}">
-                <p th:text="${item}"></p>
-            </div>
-            </div>
-            <input style="color: #336699;" type="submit" value="Choose" action = "/commitTo" onclick="this.parentElement.parentElement.classList.toggle('selected')"><br>
-        <br></div><br>
-    </div>
-
-    <div class="commitedOrders"><br>
-        <h3>Your orders:</h3><br><br>
-        <div class = "orderClass" th:each="order: ${orders}">
-            <b><p th:text="${'Submitted by: ' + order.user.firstname + ' ' + order.user.lastname}"> </p></b>
-            <p th:text="${'Postcode: ' + order.user.postcode}"></p>
-            <div class = "items"> Items:
-                <div th:each="item: ${order.shopList}">
-                    <p th:text="${item}"></p>
-                </div>
-                <br></div>
+<div class="orders">
+    <h3 id="placeOrder">Available orders:</h3><br><br>
+    <div class = "orderClass" th:each="order: ${orders}">
+        <b><p th:text="${'Submitted by: ' + order.user.firstname + ' ' + order.user.lastname}"> </p></b>
+        <p th:text="${'Postcode: ' + order.user.postcode}"></p>
+        <div class = "items"> Items:
+        <div th:each="item: ${order.shopList}">
+            <p th:text="${item}"></p>
         </div>
-    </div>
+        <input style="color: #336699;" type="submit" value="Choose" onclick="this.parentElement.parentElement.classList.toggle('selected')">
+    </div><br>
 </div>
 </body>
 </html>