Fix merge

Author: OscarArranz

backend/target/classes/templates/admin.html

@@ -125,9 +125,9 @@
 							    <tr>
 							      <th scope="row">+</th>
 							      <td>{{id}}</td>
-							      <td>{{user}}</td>
+							      <td>{{userName}}</td>
 							      <td>{{price}}</td>
-							      <td>{{course}}</td>
+							      <td>{{courseTitle}}</td>
 							      <td>{{billingAddress}}</td>
 							      <td>{{paymentMethod}}</td>
 							      <td>{{Country}}</td>

backend/target/classes/templates/checkout.html

@@ -17,7 +17,7 @@
     />
 
     <!-- Bootstrap core CSS -->
-    <link href="../assets/dist/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
 
     <!-- Custom styles for this template -->
     <link href="../css/custom.css" rel="stylesheet" />
@@ -37,7 +37,7 @@ <h2>COMPLETE YOUR ORDER</h2>
 
 	          <div class="col-6">
 	            <h4 class="mb-3">Billing Address</h4>
-	            <form class="needs-validation" novalidate  action="/orders/new" method="post" enctype="multipart/form-data">     
+	            <form class="needs-validation"  action="/orders/new" method="post" enctype="multipart/form-data">     
 					<div>
 		                <div class="col-10">
 		                  <label for="address" class="form-label">Address</label>
@@ -147,6 +147,8 @@ <h4 class="mb-3">Pago</h4>
 			             	<input name="courseId" value={{course.id}} type="hidden" class="form-control" id="inputCourse">
 			             	<input name="userId" value={{userId}} type="hidden" class="form-control" id="inputUser">
 			             	<input name="price" value={{price}} type="hidden" class="form-control" id="inputPrice">
+			             	<input name="ctitle" value={{course.title}} type="hidden" class="form-control" id="inputCtitle">
+			             	<input name="uname" value={{userName}} type="hidden" class="form-control" id="inputUname">
 			             	<button class="w-100 btn btn-primary btn-lg" type="submit"> Finalizar compra</button>
 			             	<input type="hidden" name="_csrf" value="{{token}}"/>
 			             {{/logged}}

backend/target/classes/templates/footer.html

@@ -6,4 +6,4 @@
       </div>
     </footer>
 
-  <script src="../assets/dist/js/bootstrap.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>

backend/target/classes/templates/header.html

@@ -62,8 +62,8 @@
                   class="dropdown-menu dropdown-menu-end dropdown-menu-dark"
                   aria-labelledby="navbarDarkDropdownMenuLink"
                 >
+                  <li><a class="dropdown-item" href="/myaccount/{{userId}}">My account</a></li>
                   <li><a class="dropdown-item" href="/courses/user/{{userId}}">My courses</a></li>
-                  <li><a class="dropdown-item" href="#">My account</a></li>
                   {{#admin}}
                   <li><a class="dropdown-item" href="/admin">Admin Dashboard</a></li>
               		{{/admin}}