Changeset 6832924

Timestamp:

01/03/23 23:14:33 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

ae042f4

Parents:

60de3eb

Message:

Moved products page and added services page

Location:

src/main

Files:

• java/com/example/autopartz/controller/HomeController.java (modified) (3 diffs)
• java/com/example/autopartz/controller/UserController.java (modified) (1 diff)
• resources/templates/home.html (added)
• resources/templates/products.html (moved) (moved from src/main/resources/templates/homepage.html )
• resources/templates/services.html (added)

src/main/java/com/example/autopartz/controller/HomeController.java

@@ -3 +3 @@
 import com.example.autopartz.model.User;
 import com.example.autopartz.repository.PartsForCarTypeAndCategoryRepository;
+import com.example.autopartz.repository.RepairShopReviewSummaryRepository;
 import com.example.autopartz.service.CarService;
 import com.example.autopartz.service.CategoryService;
@@ -22 +23 @@
     private final CarService carService;
     private final CategoryService categoryService;
+    private final RepairShopReviewSummaryRepository repairShopReviewSummaryRepository;
 
-    public HomeController(LoginService loginService, PartService partService, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, CarService carService, CategoryService categoryService) {
+    public HomeController(LoginService loginService, PartService partService, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, CarService carService, CategoryService categoryService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository) {
         this.loginService = loginService;
         this.partService = partService;
@@ -29 +31 @@
         this.carService = carService;
         this.categoryService = categoryService;
+        this.repairShopReviewSummaryRepository = repairShopReviewSummaryRepository;
     }
 
     @GetMapping()
     public String getHomePage(Model model){
+        model.addAttribute("bodyContent","home");
+        return "master-template";
+    }
+    @GetMapping("/products")
+    public String getProducts(Model model){
         model.addAttribute("parts",partService.findAll());
         model.addAttribute("cars",carService.findAll());
         model.addAttribute("categories",categoryService.findAll());
-        model.addAttribute("bodyContent","homepage");
+        model.addAttribute("bodyContent","products");
+        return "master-template";
+    }
+    @GetMapping("/services")
+    public String getServices(Model model){
+        model.addAttribute("services",repairShopReviewSummaryRepository.findAll());
+        model.addAttribute("bodyContent","services");
         return "master-template";
     }

src/main/java/com/example/autopartz/controller/UserController.java

@@ -15 +15 @@
 public class UserController {
     private final UserService userService;
-    private final RepairShopReviewSummaryRepository repairShopReviewSummaryRepository;
-
     private final OrdersForUserRepository ordersForUserRepository;
     private final RepairsForUserRepository repairsForUserRepository;
     private final ReviewsForUserRepository reviewsForUserRepository;
-    public UserController(UserService userService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository, OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
+    public UserController(UserService userService, OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
         this.userService = userService;
-        this.repairShopReviewSummaryRepository = repairShopReviewSummaryRepository;
         this.ordersForUserRepository = ordersForUserRepository;
         this.repairsForUserRepository = repairsForUserRepository;
         this.reviewsForUserRepository = reviewsForUserRepository;
-    }
-    @GetMapping("reportTest")
-    public List<RepairShopReviewsSummary> getRepairShopReport(){
-        return repairShopReviewSummaryRepository.findAll();
     }
     @GetMapping("usersTest")