Changeset 2efe93e in Git for src/main/java

Timestamp:

02/06/22 20:01:15 (3 years ago)

Author:

Petar Partaloski <ppartaloski@…>

Branches:

main

Children:

42d565b

Parents:

f25e8dd

Message:

Improved Front-End, added card view of movies

Location:

src/main/java/com/wediscussmovies/project

Files:

• configuration/SecurityConfig.java (modified) (1 diff)
• web/controller/MovieController.java (modified) (3 diffs)
• web/controller/UsersController.java (modified) (3 diffs)

src/main/java/com/wediscussmovies/project/configuration/SecurityConfig.java

@@ -29 +29 @@
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/movies","/movies/**/","/actors","/persons/**/","/directors","/discussions","/discussions/**/","/discussions/all/**/","/replies","/register","/genres").permitAll()
+                .antMatchers("/movies","/movies/**/","/actors","/persons/**/","/directors","/discussions","/discussions/**/","/discussions/all/**/","/replies","/register","/genres", "/css/**", "/js/**").permitAll()
                 .anyRequest()
                 .authenticated()

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

@@ -1 +1 @@
 package com.wediscussmovies.project.web.controller;
 
+import com.wediscussmovies.project.LoggedUser;
 import com.wediscussmovies.project.model.Movie;
 import com.wediscussmovies.project.model.Person;
@@ -19 +20 @@
 import java.sql.Date;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 
@@ -53 +55 @@
           model.addAttribute("user",user);
         }
-
+        List<Movie> movieList = movies;
+        List<List<Movie>> movie_rows = new ArrayList<>();
+        for(int i=0; i<movieList.size(); i+=4){
+            int j = i+4;
+            if(j>movieList.size())
+                j=movieList.size();
+            movie_rows.add(movieList.subList(i, j));
+        }
         model.addAttribute("movies", movies);
+        model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate", "moviesList");
         if (error != null && !error.equals(" "))

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

@@ -3 +3 @@
 
 import com.wediscussmovies.project.LoggedUser;
+import com.wediscussmovies.project.model.Movie;
 import com.wediscussmovies.project.model.exception.InvalidArgumentsException;
 import com.wediscussmovies.project.model.exception.PasswordsDoNotMatchException;
@@ -13 +14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Controller
@@ -59 +63 @@
     @GetMapping("/favoriteList")
     public String getFavoriteList(Model model){
-        model.addAttribute("movies",this.movieService.findLikedMoviesByUser(LoggedUser.getLoggedUser()));
+        List<Movie> movieList = this.movieService.findLikedMoviesByUser(LoggedUser.getLoggedUser());
+        List<List<Movie>> movie_rows = new ArrayList<>();
+        for(int i=0; i<movieList.size(); i+=4){
+            int j = i+4;
+            if(j>movieList.size())
+                j= movieList.size();
+            movie_rows.add(movieList.subList(i, j));
+        }
+        model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate","favoriteList");
         return "template";