Changeset 632e3d8 for src/main/resources

Timestamp:

02/08/23 14:41:27 (23 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

2c7a732

Parents:

39a45e6 (diff), 90317ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/DenicaKj/MovieZone

Location:

src/main/resources/templates

Files:

• event.html (added)
• events.html (modified) (3 diffs)
• films.html (modified) (1 diff)
• projections.html (modified) (1 diff)
• workers.html (modified) (1 diff)

src/main/resources/templates/events.html

@@ -194 +194 @@
         border-radius: 20px;
     }
+    .form-group{
+        width: 200px;
+    }
 </style>
+<div>
+    <form th:action="@{'/home/events'}"
+          th:method="GET">
+
+        <div class="form-group">
+            <label style="color: white;font-size: 20px;font-weight: bold">Кино</label>
+            <select name="id_cinema" class="form-control" id="id_cinema">
+                <option
+                        th:selected="${cinemas.get(1)}"
+                        th:each="cinema : ${cinemas}"
+                        th:value="${cinema.getId_cinema()}"
+                        th:text="${cinema.getName()}">
+                </option>
+            </select>
+
+        </div>
+        <button class="button" type="submit">Filter</button>
+    </form>
+
 <div xmlns:th="http://www.thymeleaf.org">
+    <h1 style="color: white">Настани</h1>
     <div class="main">
         <div th:each="event : ${events}" class="container">
@@ -208 +231 @@
                         <span th:text="${event.getDuration()}"></span>
                     </div>
-                    <form th:action="@{'/home/getFilm/{id}' (id=${event.getId_event()})}"
+                    <form th:action="@{'/home/getEvent/{id}' (id=${event.getId_event()})}"
                           th:method="GET">
                         <button class="button" type="submit">Датали</button>
@@ -218 +241 @@
     </div>
 </div>
+</div>

src/main/resources/templates/films.html

@@ -219 +219 @@
 
 <div xmlns:th="http://www.thymeleaf.org">
-    <div class="main">
+    <div class="main" style="width: available;height: available">
         <div    th:if="${films.isEmpty()} == false"
                 th:each="film : ${films}" class="container">

src/main/resources/templates/projections.html

@@ -198 +198 @@
     <div class="main">
 
-<!--<div th:each="projection: ${projections}">-->
-
-        <div th:each="projection: ${projections}" class="container">
+
+        <div th:each="film: ${films}" class="container">
             <div class="card">
                 <div class="imgBx">
-                    <img th:src="@{${projection.film.getUrl()}}"/>
+                    <img th:src="@{${film.getUrl()}}"/>
                 </div>
                 <div class="contentBx">
-                    <h2  th:text="${projection.film.getName()}"></h2>
+                    <h2  th:text="${film.getName()}"></h2>
                     <div class="size">
                         <h3>Duration :</h3>
-                        <span th:text="${projection.film.getDuration()}"></span>
+                        <span th:text="${film.getDuration()}"></span>
                     </div>
                     <div class="color">
                         <h3>Genre:</h3>
-                        <span th:text="${projection.film.getGenre()}"></span>
+                        <span th:text="${film.getGenre()}"></span>
                     </div>
                 </div>

src/main/resources/templates/workers.html

@@ -1 +1 @@
 <div xmlns:th="http://www.thymeleaf.org">
-  <section class="jumbotron text-center">
-    <div class="container">
-      <h1 class="jumbotron-heading">Вработени</h1>
-    </div>
-  </section>
-
+  <h1 style="color: white">Вработени</h1>
   <div class="container mb-4">
     <div class="row">