diff --git a/data.mv.db b/data.mv.db index f8c9ebf..b997069 100644 Binary files a/data.mv.db and b/data.mv.db differ diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java index 5040790..7129c6f 100644 --- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java +++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java @@ -24,7 +24,7 @@ public class CollectionMvcController { @GetMapping public String getCollections(Model model) { - model.addAttribute("collection", + model.addAttribute("collections", collectionService.findAllCollections().stream() .map(CollectionDTO::new) .toList()); diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmMvcController.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmMvcController.java index 36f3d66..588b787 100644 --- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmMvcController.java +++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmMvcController.java @@ -25,7 +25,7 @@ public class FilmMvcController { @GetMapping public String getFilms(Model model) { - model.addAttribute("film", + model.addAttribute("films", filmService.findAllFilms().stream() .map(FilmDTO::new) .toList()); diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java index c147f6d..46b29c5 100644 --- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java +++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java @@ -18,7 +18,7 @@ public class GenreMvcController { @GetMapping public String getGenres(Model model) { - model.addAttribute("genre", + model.addAttribute("genres", genreService.findAllGenres().stream() .map(GenreDTO::new) .toList()); diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css new file mode 100644 index 0000000..07beeff --- /dev/null +++ b/src/main/resources/static/css/style.css @@ -0,0 +1,50 @@ +header{ + font-size: 28px; +} +.logo{ + font-size: 64px; + line-height: 76px; +} +footer{ + width: 100%; + position: absolute; + bottom: 0; + margin: 0 !important; +} +body { + background: fixed; + background-color: blue !important; + min-height: 100vh; + position: relative; +} +.first_page{ + background-image: url(../images/Фон1.jpg); + min-height: 100vh; + width: 100%; + background-size: cover; + background-position: center; +} +.banner-block { + width: 90%; +} + +.banner-card { + width: 0; + height: 0; + overflow: hidden; + opacity: 0.2; + transition: 0.5s opacity ease; +} + +.banner-card.active { + display: flex; + justify-content: center; + width: 100%; + height: auto; + opacity: 1; + margin: 0 auto; +} + +.banner-card.active img { + height: 75vh; +} \ No newline at end of file diff --git a/src/main/resources/static/images/banner1.jpg b/src/main/resources/static/images/banner1.jpg new file mode 100644 index 0000000..6305a1d Binary files /dev/null and b/src/main/resources/static/images/banner1.jpg differ diff --git a/src/main/resources/static/images/banner2.jpg b/src/main/resources/static/images/banner2.jpg new file mode 100644 index 0000000..93e6aee Binary files /dev/null and b/src/main/resources/static/images/banner2.jpg differ diff --git a/src/main/resources/static/images/banner3.jpg b/src/main/resources/static/images/banner3.jpg new file mode 100644 index 0000000..6f15c5e Binary files /dev/null and b/src/main/resources/static/images/banner3.jpg differ diff --git a/src/main/resources/static/images/name.png b/src/main/resources/static/images/name.png new file mode 100644 index 0000000..51f2d6f Binary files /dev/null and b/src/main/resources/static/images/name.png differ diff --git a/src/main/resources/static/images/Фон1.jpg b/src/main/resources/static/images/Фон1.jpg new file mode 100644 index 0000000..2dc81c7 Binary files /dev/null and b/src/main/resources/static/images/Фон1.jpg differ diff --git a/src/main/resources/templates/collection-edit.html b/src/main/resources/templates/collection-edit.html new file mode 100644 index 0000000..eedff8d --- /dev/null +++ b/src/main/resources/templates/collection-edit.html @@ -0,0 +1,27 @@ + + + + + +
+
+
+
+ + +
+
+ + + Назад + +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/collection.html b/src/main/resources/templates/collection.html new file mode 100644 index 0000000..e0930d4 --- /dev/null +++ b/src/main/resources/templates/collection.html @@ -0,0 +1,50 @@ + + + + + +
+

Коллекции

+
+ + Добавить + +
+
+ + + + + + + + + + + + + +
Название
+
+ + Изменить + + +
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html new file mode 100644 index 0000000..29bdbb5 --- /dev/null +++ b/src/main/resources/templates/default.html @@ -0,0 +1,45 @@ + + + + + VIDEO | FILMS + + + + + + + +
+ +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/film-edit.html b/src/main/resources/templates/film-edit.html new file mode 100644 index 0000000..b877a50 --- /dev/null +++ b/src/main/resources/templates/film-edit.html @@ -0,0 +1,27 @@ + + + + + +
+
+
+
+ + +
+
+ + + Назад + +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/film.html b/src/main/resources/templates/film.html new file mode 100644 index 0000000..258624e --- /dev/null +++ b/src/main/resources/templates/film.html @@ -0,0 +1,50 @@ + + + + + +
+

Фильмы

+
+ + Добавить + +
+
+ + + + + + + + + + + + + +
Название
+
+ + Изменить + + +
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/genre-edit.html b/src/main/resources/templates/genre-edit.html new file mode 100644 index 0000000..417d9ac --- /dev/null +++ b/src/main/resources/templates/genre-edit.html @@ -0,0 +1,27 @@ + + + + + +
+
+
+
+ + +
+
+ + + Назад + +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/genre.html b/src/main/resources/templates/genre.html new file mode 100644 index 0000000..fd2a381 --- /dev/null +++ b/src/main/resources/templates/genre.html @@ -0,0 +1,50 @@ + + + + + +
+

Жанры

+
+ + Добавить + +
+
+ + + + + + + + + + + + + +
Название
+
+ + Изменить + + +
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 0356770..d10e03e 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,10 +1,33 @@ - + - - VIDEOFILMS -

Hello!

+
+ +
+ + + \ No newline at end of file