Changeset ad4243e in Git

Timestamp:

02/07/22 21:26:03 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

0226942

Parents:

7f36551 (diff), 3c0f9a9 (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.

git-author:

Mato-77 <56981531+Mato-77@…> (02/07/22 21:26:03)

git-committer:

GitHub <noreply@…> (02/07/22 21:26:03)

Message:

Merge pull request #2 from partaloski/master

Added genre liking, fixed counter, improved paging, improved searches

Files:

• src/main/java/com/wediscussmovies/project/model/primarykeys/GenreLikesPK.java (added)
• src/main/java/com/wediscussmovies/project/model/primarykeys/UserGenresPK.java (modified) (3 diffs)
• src/main/java/com/wediscussmovies/project/querymodels/GenreLikes.java (modified) (1 diff)
• src/main/java/com/wediscussmovies/project/repository/GenreLikesRepository.java (added)
• src/main/java/com/wediscussmovies/project/repository/GenreRepository.java (modified) (2 diffs)
• src/main/java/com/wediscussmovies/project/repository/MovieRepository.java (modified) (2 diffs)
• src/main/java/com/wediscussmovies/project/service/GenreService.java (modified) (1 diff)
• src/main/java/com/wediscussmovies/project/service/MovieService.java (modified) (2 diffs)
• src/main/java/com/wediscussmovies/project/service/PersonService.java (modified) (2 diffs)
• src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java (modified) (4 diffs)
• src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java (modified) (1 diff)
• src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java (modified) (3 diffs)
• src/main/java/com/wediscussmovies/project/web/PageFrontMovies.java (added)
• src/main/java/com/wediscussmovies/project/web/controller/GenreController.java (modified) (2 diffs)
• src/main/java/com/wediscussmovies/project/web/controller/MovieController.java (modified) (5 diffs)
• src/main/java/com/wediscussmovies/project/web/controller/PersonController.java (modified) (2 diffs)
• src/main/java/com/wediscussmovies/project/web/controller/rest/GenreRestController.java (added)
• src/main/resources/static/css/shared.css (modified) (1 diff)
• src/main/resources/static/js/sharedScript.js (modified) (7 diffs)
• src/main/resources/templates/genres.html (modified) (1 diff)
• src/main/resources/templates/moviesListPaged.html (added)
• src/main/resources/templates/personShow.html (modified) (1 diff)
• src/main/resources/templates/personsList.html (modified) (1 diff)
• target/classes/com/wediscussmovies/project/LoggedUser.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/configuration/SecurityConfig.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/model/Movie.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/model/primarykeys/GenreLikesPK.class (added)
• target/classes/com/wediscussmovies/project/model/primarykeys/UserGenresPK.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/querymodels/GenreLikes.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/repository/GenreLikesRepository.class (added)
• target/classes/com/wediscussmovies/project/repository/GenreRepository.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/repository/MovieRepository.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/repository/UserRepository.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/service/GenreService.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/service/MovieService.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/service/impl/GenreServiceImpl.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/service/impl/MovieServiceImpl.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/service/impl/PersonServiceImpl.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/web/DesignFrontMovies.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/web/PageFrontMovies.class (added)
• target/classes/com/wediscussmovies/project/web/controller/GenreController.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/web/controller/MovieController.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/web/controller/PersonController.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/web/controller/UsersController.class (modified) ( previous)
• target/classes/com/wediscussmovies/project/web/controller/rest/GenreRestController.class (added)
• target/classes/static/css/shared.css (modified) (1 diff)
• target/classes/static/js/sharedScript.js (modified) (7 diffs)
• target/classes/templates/genres.html (modified) (1 diff)
• target/classes/templates/moviesListPaged.html (added)
• target/classes/templates/personShow.html (modified) (1 diff)
• target/classes/templates/personsList.html (modified) (1 diff)

src/main/java/com/wediscussmovies/project/model/primarykeys/UserGenresPK.java

@@ -1 +1 @@
 package com.wediscussmovies.project.model.primarykeys;
+
+import lombok.Data;
 
 import javax.persistence.Column;
@@ -6 +8 @@
 import java.io.Serializable;
 
+@Data
 @Embeddable
 public class UserGenresPK implements Serializable {
@@ -30 +33 @@
         UserGenresPK that = (UserGenresPK) o;
 
-
-
         return userId == that.userId && genreId == that.genreId;
     }

src/main/java/com/wediscussmovies/project/querymodels/GenreLikes.java

@@ -3 +3 @@
 import lombok.Data;
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Comparator;
+import java.util.Objects;
+
 @Data
 public class GenreLikes {
-
+    private Integer genreId;
     private String name;
     private Long likes;
 
-    public GenreLikes(String name, Long likes) {
+    public static Comparator<GenreLikes> sorter = Comparator.comparing(GenreLikes::getLikes).thenComparing(GenreLikes::getName).reversed();
+
+    public GenreLikes(Integer genreId, String name, Long likes) {
+        this.genreId = genreId;
         this.name = name;
         this.likes = likes;
+
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GenreLikes that = (GenreLikes) o;
+        return Objects.equals(genreId, that.genreId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(genreId);
     }
 }

src/main/java/com/wediscussmovies/project/repository/GenreRepository.java

@@ -4 +4 @@
 import com.wediscussmovies.project.querymodels.GenreLikes;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.transaction.Transactional;
+import java.sql.Date;
 import java.util.List;
 
@@ -14 +17 @@
      List<Genre> findAllByGenreType(String genre);
 
-     @Query(value = "select new com.wediscussmovies.project.querymodels.GenreLikes(g.genreType, count(ug.id.userId)) from Genre g" +
+     @Query(value = "select new com.wediscussmovies.project.querymodels.GenreLikes(g.genreId, g.genreType, count(ug.id.userId)) from Genre g" +
              " left join UserGenres ug on ug.id.genreId = g.genreId" +
-             " group by g.genreType" +
+             " group by g.genreId, g.genreType" +
              " order by count(ug.id.userId) desc")
      @Transactional
      List<GenreLikes> findAllWithLikes();
+
+     @Modifying
+     @Query(value = "insert into project.user_genres (user_id,genre_id) values(:user_id,:genre_id)",nativeQuery = true)
+     @Transactional
+     void insertInto(@Param("user_id")Integer userId, @Param("genre_id")Integer genreId);
 }

src/main/java/com/wediscussmovies/project/repository/MovieRepository.java

@@ -4 +4 @@
 import com.wediscussmovies.project.model.Person;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -13 +14 @@
      List<Movie> findAllByDirector(Person director);
      List<Movie> findAllByDirectorIsNull();
+     @Query(value="select m.movieId from Movie m")
+     List<Integer> findAllMovieIds();
 }

src/main/java/com/wediscussmovies/project/service/GenreService.java

@@ -14 +14 @@
     Genre save(String genreName);
     List<GenreLikes> findAllWithLikes();
+    void likeGenre(Integer genreId,Integer userId);
+    void unlikeGenre(Integer genreId,Integer userId);
 
 }

src/main/java/com/wediscussmovies/project/service/MovieService.java

@@ -6 +6 @@
 import com.wediscussmovies.project.model.Person;
 import com.wediscussmovies.project.model.User;
+import org.springframework.data.jpa.repository.Query;
 
 import java.sql.Date;
@@ -16 +17 @@
      List<Movie> searchByTitle(String title);
      Movie findById(Integer id);
+     List<Integer> listAllIds();
      Movie save(String title, String description, String imageUrl, Date airingDate,Double  rating,
                 Integer directorId,List<Integer> actorIds,List<Integer> genreIds);

src/main/java/com/wediscussmovies/project/service/PersonService.java

@@ -5 +5 @@
 import com.wediscussmovies.project.model.Person;
 import com.wediscussmovies.project.model.User;
+import com.wediscussmovies.project.model.relation.MovieLikes;
 
 import java.sql.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public interface PersonService {
@@ -27 +29 @@
     void deleteById(Integer id);
     void addGradePerson(Integer personId, User user, Grade grade);
-
 }

src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java

@@ -1 +1 @@
 package com.wediscussmovies.project.service.impl;
 
+import com.wediscussmovies.project.model.User;
 import com.wediscussmovies.project.model.exception.GenreNotExistException;
+import com.wediscussmovies.project.model.exception.UserNotExistException;
+import com.wediscussmovies.project.model.primarykeys.GenreLikesPK;
+import com.wediscussmovies.project.model.primarykeys.UserGenresPK;
+import com.wediscussmovies.project.model.relation.MovieLikes;
+import com.wediscussmovies.project.model.relation.UserGenres;
 import com.wediscussmovies.project.querymodels.GenreLikes;
+import com.wediscussmovies.project.repository.GenreLikesRepository;
 import com.wediscussmovies.project.repository.GenreRepository;
 import com.wediscussmovies.project.model.Genre;
+import com.wediscussmovies.project.repository.UserRepository;
 import com.wediscussmovies.project.service.GenreService;
 import org.springframework.stereotype.Service;
@@ -13 +21 @@
 public class GenreServiceImpl implements GenreService {
     private final GenreRepository genreRepository;
+    private final UserRepository userRepository;
+    private final GenreLikesRepository genreLikesRepository;
 
-    public GenreServiceImpl(GenreRepository genreRepository) {
+
+    public GenreServiceImpl(GenreRepository genreRepository, UserRepository userRepository, GenreLikesRepository genreLikesRepository) {
         this.genreRepository = genreRepository;
+        this.userRepository = userRepository;
+        this.genreLikesRepository = genreLikesRepository;
     }
 
@@ -36 +49 @@
     @Override
     public List<GenreLikes> findAllWithLikes() {
-        return this.genreRepository.findAllWithLikes();
+        List<GenreLikes> genreLikesList = this.genreRepository.findAllWithLikes();
+        genreLikesList.sort(GenreLikes.sorter);
+        return genreLikesList;
     }
 
@@ -43 +58 @@
         return this.genreRepository.findAll();
     }
+
+    @Override
+    public void likeGenre(Integer genreId, Integer userId) {
+        User user = this.userRepository.findById(userId).orElseThrow(() -> new UserNotExistException(userId.toString()));
+        Genre genre = this.genreRepository.findById(genreId).orElseThrow(() -> new GenreNotExistException(genreId));
+        this.genreLikesRepository.save(new UserGenres(genre, user));
+    }
+
+    @Override
+    public void unlikeGenre(Integer genreId, Integer userId) {
+        UserGenresPK movieLikesPK = new UserGenresPK(userId, genreId);
+        this.genreLikesRepository.deleteById(movieLikesPK);
+    }
 }

src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java

@@ -76 +76 @@
 
     @Override
+    public List<Integer> listAllIds() {
+        return this.movieRepository.findAllMovieIds();
+    }
+
+    @Override
     @Transactional
     public Movie save(String title, String description, String imageUrl,

src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java

@@ -9 +9 @@
 import com.wediscussmovies.project.model.primarykeys.PersonRatesPK;
 import com.wediscussmovies.project.model.relation.MovieActors;
-import com.wediscussmovies.project.model.relation.MovieRates;
 import com.wediscussmovies.project.model.relation.PersonRates;
-import com.wediscussmovies.project.repository.MovieActorsRepository;
-import com.wediscussmovies.project.repository.MovieRepository;
-import com.wediscussmovies.project.repository.PersonRatesRepository;
-import com.wediscussmovies.project.repository.PersonRepository;
+import com.wediscussmovies.project.repository.*;
 import com.wediscussmovies.project.model.Person;
 import com.wediscussmovies.project.service.PersonService;
@@ -32 +28 @@
     private final MovieActorsRepository movieActorsRepository;
     private final PersonRatesRepository personRatesRepository;
-
 
     public PersonServiceImpl(PersonRepository personRepository,
@@ -156 +151 @@
 
 
+
+
     private void addActorForMovies(Person person, List<Integer> movieIds){
 

src/main/java/com/wediscussmovies/project/web/controller/GenreController.java

@@ -1 +1 @@
 package com.wediscussmovies.project.web.controller;
 
+import com.wediscussmovies.project.LoggedUser;
+import com.wediscussmovies.project.model.Genre;
+import com.wediscussmovies.project.model.User;
+import com.wediscussmovies.project.model.relation.UserGenres;
+import com.wediscussmovies.project.querymodels.GenreLikes;
+import com.wediscussmovies.project.repository.GenreLikesRepository;
 import com.wediscussmovies.project.service.GenreService;
 import org.springframework.stereotype.Controller;
@@ -7 +13 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Controller
 @RequestMapping("/genres")
 public class GenreController {
     private final GenreService genreService;
+    private final GenreLikesRepository genreLikesRepository;
 
-    public GenreController(GenreService genreService) {
+    public GenreController(GenreService genreService, GenreLikesRepository genreLikesRepository) {
         this.genreService = genreService;
+        this.genreLikesRepository = genreLikesRepository;
     }
     @GetMapping
     public String getGenres(Model model){
         model.addAttribute("genres",genreService.findAllWithLikes());
+        model.addAttribute("allGenres", genreService.findAll());
         model.addAttribute("contentTemplate","genres");
+        addModelPropertiesForUser(model);
         return "template";
     }
+
+    private void addModelPropertiesForUser(Model model){
+        User user = LoggedUser.getLoggedUser();
+        List<UserGenres> genreLikesList = this.genreLikesRepository.findAllByUser(user);
+        List<Genre> genres = new ArrayList<>();
+        for(UserGenres g: genreLikesList){
+            genres.add(genreService.findById(g.getId().getGenreId()));
+        }
+        model.addAttribute("likedGenres",genres);
+        model.addAttribute("user",user);
+    }
 }

src/main/java/com/wediscussmovies/project/web/controller/MovieController.java

@@ -9 +9 @@
 import com.wediscussmovies.project.service.PersonService;
 import com.wediscussmovies.project.web.DesignFrontMovies;
+import com.wediscussmovies.project.web.PageFrontMovies;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -37 +38 @@
     }
 
-    @GetMapping
+    @GetMapping("/old")
     public String getMovies(@RequestParam(required = false) String titleQuery, Model model,
                             @RequestParam(required = false) String error){
@@ -55 +56 @@
         model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate", "moviesList");
+        if (error != null && !error.equals(" "))
+            model.addAttribute("error",error);
+        return "template";
+    }
+
+
+    @GetMapping
+    public String getMoviesAlternative(@RequestParam(required = false) String titleQuery, Model model,
+                            @RequestParam(required = false) String error, @RequestParam(required = false) String page){
+        if (page==null){
+            return "redirect:/movies?page=1";
+        }
+        addModelPropertiesForUser(model);
+        List<Movie> movies = PageFrontMovies.getPagedMovies(page, movieService, model);
+        List<List<Movie>> movie_rows = new ArrayList<>();
+        DesignFrontMovies.designMovieList(movies,movie_rows);
+        model.addAttribute("movies", movies);
+        model.addAttribute("movie_rows", movie_rows);
+        model.addAttribute("contentTemplate", "moviesListPaged");
         if (error != null && !error.equals(" "))
             model.addAttribute("error",error);
@@ -160 +180 @@
     }
     private void addModelProperties(Model model){
-
-        model.addAttribute("directors",  personService.findAllDirectors());
+        model.addAttribute("directors", personService.findAllDirectors());
         model.addAttribute("actors", personService.findAllActors());
         model.addAttribute("genres", genreService.findAll());
@@ -169 +188 @@
         model.addAttribute("likedMovies",this.movieService.findLikedMoviesByUser(user));
         model.addAttribute("user",user);
-        }
+    }
 
 }

src/main/java/com/wediscussmovies/project/web/controller/PersonController.java

@@ -1 +1 @@
 package com.wediscussmovies.project.web.controller;
 
+import com.wediscussmovies.project.LoggedUser;
 import com.wediscussmovies.project.model.Person;
+import com.wediscussmovies.project.model.User;
 import com.wediscussmovies.project.service.MovieService;
 import com.wediscussmovies.project.service.PersonService;
@@ -135 +137 @@
     }
 
+    private void addModelPropertiesForUser(Model model){
+        User user = LoggedUser.getLoggedUser();
+        model.addAttribute("user",user);
+    }
+
 
 }

src/main/resources/static/css/shared.css

@@ -70 +70 @@
     text-align: center;
 }
+
+#paging-section{
+    width: 100%;
+    clear: both;
+    margin-bottom: 30px;
+}
+
+#inner-paging{
+    width: fit-content;
+    margin: auto;
+
+}
+
+#button-sub, #button-add{
+    width: 100px;
+}
+
+#pageInput{
+    font-size: 100%;
+    text-align: center;
+    width: 175px;
+    margin: auto;
+}
+
+#button-submit-page{
+    margin: auto;
+    text-align: center;
+    margin-top: 7px;
+    display: none;
+}
+
+.visibility{
+    transition: 200ms;
+    opacity: 0;
+}

src/main/resources/static/js/sharedScript.js

@@ -4 +4 @@
     var elements = $(".elements")
     var elementGrade;
+
+
+    $("#button-add").on("click", function (){
+        itemInput = $("#pageInput")
+        itemInput.val(Number(itemInput.val()) + 1);
+        $("#button-submit-page").click()
+    })
+
+    $("#button-sub").on("click", function (){
+        itemInput = $("#pageInput")
+        if(Number(itemInput.val()) > 1){
+            itemInput.val(Number(itemInput.val()) - 1);
+            $("#button-submit-page").click()
+        }
+    })
+
+    $("#searchTitle").on("keyup", function() {
+        var value = $(this).val().toLowerCase();
+        console.log(value)
+        $(".elements div a .title").filter(function() {
+            console.log($(this).text())
+            if($(this).text().toLowerCase().indexOf(value) <= -1)
+                $(this).parent().parent().parent().addClass("visibility")
+            else
+                $(this).parent().parent().parent().removeClass("visibility")
+        });
+    });
+
+
 
 
@@ -37 +66 @@
 
 
-    $(".search-button-title").on("click",function (){
+    /*$(".search-button-title").on("click",function (){
         let filter = $("#searchTitle").val()
         console.log(elements)
@@ -50 +79 @@
             }
         }
-
-    })
+    })*/
 
 
    $(".search-button").on("click",function () {
         let filter = $("#searchGenre").val()
-       console.log(elements)
-
        for (let item of elements) {
             let genre = $(item).find(".card-genre")
@@ -64 +90 @@
             for (let g of genre) {
 
-                if ($(g).text().toLowerCase() === filter.toLowerCase()) {
+                if (( $(g).text().toLowerCase() === filter.toLowerCase() && !$(g).hasClass("visibility") && filter.trim().length != 0)) {
                     visible = true
-                    $(item).css("display","block")
+                    $(item).removeClass("visibility")
                     break;
                 }
             }
-            if (!visible)
-                $(item).css("display","none")
+            if (!visible && filter.trim().length != 0)
+                $(item).addClass("visibility")
+            else
+                $(item).removeClass("visibility")
+
         }
     });
@@ -117 +146 @@
         let url = "api/movies/unlike/"+ $(this).attr("movie-id")+"?userId="+ $(this).attr("user-id")
         ajaxCallLike(url,button,'unlike','Немате оставено допаѓање на филмот!')
+    })
+    $(document.body).on("click",".button-add-genre-liked-list",function (){
+        let button = $(this)
+        let url = "api/genres/like/"+ $(this).attr("genre-id") + "?userId="+ $(this).attr("user-id")
+        ajaxCallLikeGenre(url,button,'like','Веќе ви се допаѓа жанрот!')
+    })
+    $(document.body).on("click",".button-remove-genre-liked-list",function (){
+        let button = $(this)
+        let url = "api/genres/unlike/"+ $(this).attr("genre-id")+"?userId="+ $(this).attr("user-id")
+        ajaxCallLikeGenre(url,button,'unlike','Немате оставено допаѓање на жанрот!')
     })
     $(".discussion-type").change(function (){
@@ -157 +196 @@
 
                 }
+                $(button).remove()
             }
             else {
@@ -180 +220 @@
     })
 }
+
+
+
+function ajaxCallLikeGenre(url,button,type,message){
+    $.ajax({
+        url:url,
+        success:function (data){
+            if (data){
+                let el = $(button).parent().siblings().eq(3)
+                console.log(el)
+                if (type=="like") {
+                    $(el).html(parseInt($(el).text()) + 1)
+                    console.log("da")
+                }
+                else
+                    $(el).html(parseInt($(el).text()) - 1)
+                $(button).css("display","none")
+                let userId = $(button).attr("user-id")
+                let genreId=$(button).attr("genre-id")
+                if (type==='like') {
+                    $(button).parent().append("<a class='btn btn-danger button-remove-genre-liked-list' genre-id=" + genreId + " user-id=" + userId + ">💔</a>")
+                    console.log("da")
+                }
+                else{
+                    $(button).parent().append("<a class='btn btn-success button-add-genre-liked-list' genre-id=" + genreId + " user-id=" + userId + ">❤</a>")
+                }
+                let likes_sibling = $("#"+genreId+"genre")
+                value_likes = Number(likes_sibling.text())
+                if(type=="like")
+                    value_likes+=1
+                else
+                    value_likes-=1
+                likes_sibling.text(value_likes)
+                $(button).remove()
+            }
+            else {
+                $(button).parent().append("<div>" + message +" <button class='button-confirm'>Ок</button></div>")
+            }
+        }
+    })
+}
+
+
 function  ajaxCallRating(url,button,type){
     model = {

src/main/resources/templates/genres.html

@@ -1 @@
-<div class="container mb-4">
-  <div class="row">
-    <div class="col-12">
-      <div class="table-responsive">
-        <table class="table table-striped">
-          <thead>
-          <tr>
-            <th scope="col">Име</th>
-            <th scope="col">Лајкови</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr th:each="genre : ${genres}" class="elements">
-            <td th:text="${genre.getName()}"></td>
-            <td th:text="${genre.getLikes()}"></td>
+<div class="container mb-4" xmlns:sec="http://www.w3.org/1999/xhtml">
 
-          </tr>
-          </tbody>
-        </table>
+    <div class="row">
+      <div class="col-12">
+        <div class="table-responsive">
+          <table class="table table-striped">
+            <thead>
+            <tr>
+              <th scope="col">Име</th>
+              <th scope="col">Лајкови</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="genre : ${genres}" class="elements">
+              <td th:text="${genre.getName()}"></td>
+              <td th:text="${genre.getLikes()}" th:id="${genre.getGenreId()+'genre'}"></td>
+              <td>
+                <th:block sec:authorize="isAuthenticated()" th:each="g: ${allGenres}" th:if="${g.getGenreId() == genre.getGenreId()}">
+                  <a class="btn btn-success button-add-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${!likedGenres.contains(g)}">❤</a>
+                  <a class="btn btn-danger button-remove-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${likedGenres.contains(g)}">💔</a>
+                </th:block>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
-    </div>
+
   </div>
 </div>

src/main/resources/templates/personShow.html

@@ -30 +30 @@
         </div>
     </div>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на оцени кои филмот ги добил:</span>
+            <span th:text="${movie.getRates().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="rating: ${movie.getRates()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 130px;">
+            <div style="width: 60%; float:left;">
+                <p th:text="${rating.getReason()}" style="text-align: justify"></p>
+            </div>
+            <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;">
+                <h2 style="text-align: center">Rated:</h2>
+                <p th:text="${rating.getStarsRated() + ' out of 10 stars'}" style="text-align: center"></p>
+            </div>
+        </div>
+    </div>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на лајкови кои филмот ги добил:</span>
+            <span th:text="${movie.getLikes().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="liked: ${movie.getLikes()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 60px;">
+            <div style="width: 100%; float:left;">
+                <h3  style="text-align: center">
+                    <span th:text="${liked.getUser().getName() + ' ' + liked.getUser().getSurname()}"></span>
+                    <span style="color: green; font-size: 100%" >✔</span>
+                </h3>
+            </div>
+        </div>
+    </div>
 </div>

src/main/resources/templates/personsList.html

@@ -57 +57 @@
 
                             </td>
+
+                            <a class="bottom-heart btn btn-success button-add-favourite-list"
+                               th:movie-id="${person.getMovieId()}"
+                               th:user-id="${user.getUserId()}"
+                               th:if="${!likedPersons.contains(movie)}">❤</a>
+
+                            <a class="bottom-heart btn btn-danger button-remove-favourite-list"
+                               th:movie-id="${person.getMovieId()}" th:user-id="${user.getUserId()}"
+                               th:if="${likedPersons.contains(movie)}">💔</a>
+
+
                             </th:block>
 

target/classes/static/css/shared.css

@@ -70 +70 @@
     text-align: center;
 }
+
+#paging-section{
+    width: 100%;
+    clear: both;
+    margin-bottom: 30px;
+}
+
+#inner-paging{
+    width: fit-content;
+    margin: auto;
+
+}
+
+#button-sub, #button-add{
+    width: 100px;
+}
+
+#pageInput{
+    font-size: 100%;
+    text-align: center;
+    width: 175px;
+    margin: auto;
+}
+
+#button-submit-page{
+    margin: auto;
+    text-align: center;
+    margin-top: 7px;
+    display: none;
+}
+
+.visibility{
+    transition: 200ms;
+    opacity: 0;
+}

target/classes/static/js/sharedScript.js

@@ -4 +4 @@
     var elements = $(".elements")
     var elementGrade;
+
+
+    $("#button-add").on("click", function (){
+        itemInput = $("#pageInput")
+        itemInput.val(Number(itemInput.val()) + 1);
+        $("#button-submit-page").click()
+    })
+
+    $("#button-sub").on("click", function (){
+        itemInput = $("#pageInput")
+        if(Number(itemInput.val()) > 1){
+            itemInput.val(Number(itemInput.val()) - 1);
+            $("#button-submit-page").click()
+        }
+    })
+
+    $("#searchTitle").on("keyup", function() {
+        var value = $(this).val().toLowerCase();
+        console.log(value)
+        $(".elements div a .title").filter(function() {
+            console.log($(this).text())
+            if($(this).text().toLowerCase().indexOf(value) <= -1)
+                $(this).parent().parent().parent().addClass("visibility")
+            else
+                $(this).parent().parent().parent().removeClass("visibility")
+        });
+    });
+
+
 
 
@@ -37 +66 @@
 
 
-    $(".search-button-title").on("click",function (){
+    /*$(".search-button-title").on("click",function (){
         let filter = $("#searchTitle").val()
         console.log(elements)
@@ -50 +79 @@
             }
         }
-
-    })
+    })*/
 
 
    $(".search-button").on("click",function () {
         let filter = $("#searchGenre").val()
-       console.log(elements)
-
        for (let item of elements) {
             let genre = $(item).find(".card-genre")
@@ -64 +90 @@
             for (let g of genre) {
 
-                if ($(g).text().toLowerCase() === filter.toLowerCase()) {
+                if (( $(g).text().toLowerCase() === filter.toLowerCase() && !$(g).hasClass("visibility") && filter.trim().length != 0)) {
                     visible = true
-                    $(item).css("display","block")
+                    $(item).removeClass("visibility")
                     break;
                 }
             }
-            if (!visible)
-                $(item).css("display","none")
+            if (!visible && filter.trim().length != 0)
+                $(item).addClass("visibility")
+            else
+                $(item).removeClass("visibility")
+
         }
     });
@@ -117 +146 @@
         let url = "api/movies/unlike/"+ $(this).attr("movie-id")+"?userId="+ $(this).attr("user-id")
         ajaxCallLike(url,button,'unlike','Немате оставено допаѓање на филмот!')
+    })
+    $(document.body).on("click",".button-add-genre-liked-list",function (){
+        let button = $(this)
+        let url = "api/genres/like/"+ $(this).attr("genre-id") + "?userId="+ $(this).attr("user-id")
+        ajaxCallLikeGenre(url,button,'like','Веќе ви се допаѓа жанрот!')
+    })
+    $(document.body).on("click",".button-remove-genre-liked-list",function (){
+        let button = $(this)
+        let url = "api/genres/unlike/"+ $(this).attr("genre-id")+"?userId="+ $(this).attr("user-id")
+        ajaxCallLikeGenre(url,button,'unlike','Немате оставено допаѓање на жанрот!')
     })
     $(".discussion-type").change(function (){
@@ -157 +196 @@
 
                 }
+                $(button).remove()
             }
             else {
@@ -180 +220 @@
     })
 }
+
+
+
+function ajaxCallLikeGenre(url,button,type,message){
+    $.ajax({
+        url:url,
+        success:function (data){
+            if (data){
+                let el = $(button).parent().siblings().eq(3)
+                console.log(el)
+                if (type=="like") {
+                    $(el).html(parseInt($(el).text()) + 1)
+                    console.log("da")
+                }
+                else
+                    $(el).html(parseInt($(el).text()) - 1)
+                $(button).css("display","none")
+                let userId = $(button).attr("user-id")
+                let genreId=$(button).attr("genre-id")
+                if (type==='like') {
+                    $(button).parent().append("<a class='btn btn-danger button-remove-genre-liked-list' genre-id=" + genreId + " user-id=" + userId + ">💔</a>")
+                    console.log("da")
+                }
+                else{
+                    $(button).parent().append("<a class='btn btn-success button-add-genre-liked-list' genre-id=" + genreId + " user-id=" + userId + ">❤</a>")
+                }
+                let likes_sibling = $("#"+genreId+"genre")
+                value_likes = Number(likes_sibling.text())
+                if(type=="like")
+                    value_likes+=1
+                else
+                    value_likes-=1
+                likes_sibling.text(value_likes)
+                $(button).remove()
+            }
+            else {
+                $(button).parent().append("<div>" + message +" <button class='button-confirm'>Ок</button></div>")
+            }
+        }
+    })
+}
+
+
 function  ajaxCallRating(url,button,type){
     model = {

target/classes/templates/genres.html

@@ -1 @@
-<div class="container mb-4">
-  <div class="row">
-    <div class="col-12">
-      <div class="table-responsive">
-        <table class="table table-striped">
-          <thead>
-          <tr>
-            <th scope="col">Име</th>
-            <th scope="col">Лајкови</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr th:each="genre : ${genres}" class="elements">
-            <td th:text="${genre.getName()}"></td>
-            <td th:text="${genre.getLikes()}"></td>
+<div class="container mb-4" xmlns:sec="http://www.w3.org/1999/xhtml">
 
-          </tr>
-          </tbody>
-        </table>
+    <div class="row">
+      <div class="col-12">
+        <div class="table-responsive">
+          <table class="table table-striped">
+            <thead>
+            <tr>
+              <th scope="col">Име</th>
+              <th scope="col">Лајкови</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="genre : ${genres}" class="elements">
+              <td th:text="${genre.getName()}"></td>
+              <td th:text="${genre.getLikes()}" th:id="${genre.getGenreId()+'genre'}"></td>
+              <td>
+                <th:block sec:authorize="isAuthenticated()" th:each="g: ${allGenres}" th:if="${g.getGenreId() == genre.getGenreId()}">
+                  <a class="btn btn-success button-add-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${!likedGenres.contains(g)}">❤</a>
+                  <a class="btn btn-danger button-remove-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${likedGenres.contains(g)}">💔</a>
+                </th:block>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
-    </div>
+
   </div>
 </div>

target/classes/templates/personShow.html

@@ -30 +30 @@
         </div>
     </div>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на оцени кои филмот ги добил:</span>
+            <span th:text="${movie.getRates().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="rating: ${movie.getRates()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 130px;">
+            <div style="width: 60%; float:left;">
+                <p th:text="${rating.getReason()}" style="text-align: justify"></p>
+            </div>
+            <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;">
+                <h2 style="text-align: center">Rated:</h2>
+                <p th:text="${rating.getStarsRated() + ' out of 10 stars'}" style="text-align: center"></p>
+            </div>
+        </div>
+    </div>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на лајкови кои филмот ги добил:</span>
+            <span th:text="${movie.getLikes().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="liked: ${movie.getLikes()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 60px;">
+            <div style="width: 100%; float:left;">
+                <h3  style="text-align: center">
+                    <span th:text="${liked.getUser().getName() + ' ' + liked.getUser().getSurname()}"></span>
+                    <span style="color: green; font-size: 100%" >✔</span>
+                </h3>
+            </div>
+        </div>
+    </div>
 </div>

target/classes/templates/personsList.html

@@ -57 +57 @@
 
                             </td>
+
+                            <a class="bottom-heart btn btn-success button-add-favourite-list"
+                               th:movie-id="${person.getMovieId()}"
+                               th:user-id="${user.getUserId()}"
+                               th:if="${!likedPersons.contains(movie)}">❤</a>
+
+                            <a class="bottom-heart btn btn-danger button-remove-favourite-list"
+                               th:movie-id="${person.getMovieId()}" th:user-id="${user.getUserId()}"
+                               th:if="${likedPersons.contains(movie)}">💔</a>
+
+
                             </th:block>