Inject backend to frontend

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -35,6 +35,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency> -->
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity6</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>

src/main/java/com/attendenceSystem/constant/Routes.java

@@ -15,6 +15,7 @@ public final class Routes {
         public static final String FORGOT_PASSWORD = "/forgot-password";
         public static final String VERIFY_OTP = "/verify-otp";
         public static final String CHANGE_PASSWORD = "/change-password";
+        public static final String LOGOUT = "/logout";
     }
 
     public static final class User {
@@ -26,7 +27,7 @@ public final class Routes {
         public static final String ROOT = "/dashboard";
         public static final String ADMIN = "/admin";
         public static final String MANAGER = "/manager";
-        public static final String EMPLOYEE = "/employee";
+        public static final String STUDENT = "/student";
     }
     public static final class Attendance {
         public static final String ROOT = "/attendance";
@@ -40,4 +41,8 @@ public final class Routes {
     public static final class FaceId {
         public static final String ROOT = "/face-id";
     }
+
+    public static final class Schedule {
+        public static final String ROOT = "/schedule";
+    }
 }

src/main/java/com/attendenceSystem/constant/Views.java

@@ -21,15 +21,20 @@ public final class Views {
 
     public static final class Dashboard {
         public static final String ADMIN = "cms/dashboard/dashboard-admin";
-        public static final String MANAGER = "cms/dashboard/dashboard-manage";
+        public static final String MANAGER = "cms/dashboard/dashboard-manager";
         public static final String EMPLOYEE = "cms/dashboard/dashboard-employee";
     }
 
     public static final class Attendance {
-        public static final String ROOT = "cms/attendance/attendance";
-        public static final String LIST = "cms/attendance/attendance-list";
+        public static final String LIST = "cms/attendance/attendance";
+        public static final String HISTORY = "cms/attendance/attendance-history";
         public static final String LEAVE_CREATE = "cms/absent/absent-create";
         public static final String LEAVE_LIST = "cms/absent/absent-list";
         public static final String LEAVE_HISTORY = "cms/absent/absent-history";
     }
+
+    public static final class FaceId {
+        public static final String CREATE = "cms/face-id/faceID-create";
+        public static final String LIST = "cms/face-id/faceID-list";
+    }
 }

src/main/java/com/attendenceSystem/module/attendance/controller/AttendanceController.java

@@ -27,9 +27,9 @@ public class AttendanceController {
     private final AttendanceService attendanceService;
 
     @GetMapping
-    public String toAttendancePage(@PageableDefault(size = 10) Pageable pageable, Model model) {
+    public String toAttendanceListPage(@PageableDefault(size = 10) Pageable pageable, Model model) {
         model.addAttribute("attendanceHistory", attendanceService.getAttendanceHistory(pageable));
-        return Views.Attendance.ROOT;
+        return Views.Attendance.LIST;
     }
 
     @PostMapping(Routes.Attendance.CHECK_IN)
@@ -61,33 +61,33 @@ public class AttendanceController {
     @GetMapping(Routes.Attendance.HISTORY)
     public String attendanceHistory(@PageableDefault(size = 10) Pageable pageable, Model model) {
         model.addAttribute("attendanceHistory", attendanceService.getAttendanceHistory(pageable));
-        return Views.Attendance.LIST;
+        return Views.Attendance.HISTORY;
     }
 
     @GetMapping(Routes.Attendance.LEAVE)
     public String leaveRequestList(@PageableDefault(size = 10) Pageable pageable, Model model) {
-        model.addAttribute("leaveRequests", attendanceService.getLeaveRequests(pageable));
+        model.addAttribute("leaveRequests", attendanceService.getAllLeaveRequests(pageable));
         return Views.Attendance.LEAVE_LIST;
     }
 
     @GetMapping(Routes.Attendance.LEAVE_CREATE)
     public String toLeaveRequestPage(Model model) {
-        model.addAttribute("leaveRequest", new CreateLeaveRequest());
+        model.addAttribute("createLeaveRequest", new CreateLeaveRequest());
         return Views.Attendance.LEAVE_CREATE;
     }
 
     @PostMapping(Routes.Attendance.LEAVE_CREATE)
     public String createLeaveRequest(
-            @Valid @ModelAttribute CreateLeaveRequest leaveRequest,
+            @Valid @ModelAttribute CreateLeaveRequest createLeaveRequest,
             BindingResult result,
             RedirectAttributes redirectAttributes,
             Model model) {
         if (result.hasErrors()) {
-            model.addAttribute("leaveRequest", leaveRequest);
+            model.addAttribute("createLeaveRequest", createLeaveRequest);
             return Views.Attendance.LEAVE_CREATE;
         }
         try {
-            attendanceService.createLeaveRequest(leaveRequest);
+            attendanceService.createLeaveRequest(createLeaveRequest);
             redirectAttributes.addFlashAttribute("successMessage", "Yêu cầu nghỉ phép đã được gửi.");
         } catch (IllegalArgumentException e) {
             redirectAttributes.addFlashAttribute("errorMessage", e.getMessage());

src/main/java/com/attendenceSystem/module/attendance/repository/AttendanceRecordRepository.java

@@ -26,4 +26,7 @@ public interface AttendanceRecordRepository extends JpaRepository<AttendanceReco
     long countByAttendanceDate(LocalDate attendanceDate);
 
     Page<AttendanceRecord> findAllByOrderByAttendanceDateDesc(Pageable pageable);
+
+    long countByCheckInTimeNotNullAndCheckOutTimeNotNull();
+
 }

src/main/java/com/attendenceSystem/module/attendance/service/AttendanceService.java

@@ -18,4 +18,6 @@ public interface AttendanceService {
     LeaveRequestResponse createLeaveRequest(CreateLeaveRequest request);
 
     Page<LeaveRequestResponse> getLeaveRequests(Pageable pageable);
+
+    Page<LeaveRequestResponse> getAllLeaveRequests(Pageable pageable);
 }

src/main/java/com/attendenceSystem/module/attendance/service/impl/AttendanceServiceImpl.java

@@ -112,6 +112,11 @@ public class AttendanceServiceImpl implements AttendanceService {
                 .map(leaveRequestResponseMapper::fromEntity);
     }
 
+    @Override
+    public Page<LeaveRequestResponse> getAllLeaveRequests(Pageable pageable) {
+        return leaveRequestRepository.findAll(pageable).map(leaveRequestResponseMapper::fromEntity);
+    }
+
     private User getCurrentUser() {
         String currentUser = SecurityUtil.getCurrentUserName();
         if (currentUser == null || currentUser.isEmpty() || currentUser.isBlank()) {
@@ -121,4 +126,5 @@ public class AttendanceServiceImpl implements AttendanceService {
                 .findByUsername(currentUser)
                 .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng"));
     }
+
 }

src/main/java/com/attendenceSystem/module/dashboard/api/DashboardApiController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.attendenceSystem.constant.Routes;
 import com.attendenceSystem.module.dashboard.dto.response.AdminDashboardResponse;
-import com.attendenceSystem.module.dashboard.dto.response.EmployeeDashboardResponse;
+import com.attendenceSystem.module.dashboard.dto.response.StudentDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardResponse;
 import com.attendenceSystem.module.dashboard.service.DashboardService;
 
@@ -34,9 +34,9 @@ public class DashboardApiController {
         return ResponseEntity.ok(resp);
     }
 
-    @GetMapping(Routes.Dashboard.EMPLOYEE)
-    public ResponseEntity<EmployeeDashboardResponse> employee(Pageable pageable) {
-        EmployeeDashboardResponse resp = dashboardService.getEmployeeDashboard();
+    @GetMapping(Routes.Dashboard.STUDENT)
+    public ResponseEntity<StudentDashboardResponse> employee(Pageable pageable) {
+        StudentDashboardResponse resp = dashboardService.getStudentDashboard();
         return ResponseEntity.ok(resp);
     }
 }

src/main/java/com/attendenceSystem/module/dashboard/controller/DashboardController.java

@@ -1,5 +1,7 @@
 package com.attendenceSystem.module.dashboard.controller;
 
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,9 +31,17 @@ public class DashboardController {
         return Views.Dashboard.MANAGER;
     }
 
-    @GetMapping(Routes.Dashboard.EMPLOYEE)
+    @GetMapping(Routes.Dashboard.STUDENT)
     public String toEmployeeDashboardPage(Model model) {
-        model.addAttribute("dashboard", dashboardService.getEmployeeDashboard());
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        System.out.println("=== DASHBOARD AUTH ===");
+        System.out.println(auth);
+        if (auth != null) {
+            System.out.println("name = " + auth.getName());
+            System.out.println("authorities = " + auth.getAuthorities());
+            System.out.println("authenticated = " + auth.isAuthenticated());
+        }
+        model.addAttribute("dashboard", dashboardService.getStudentDashboard());
         return Views.Dashboard.EMPLOYEE;
     }
 }

src/main/java/com/attendenceSystem/module/dashboard/dto/response/{EmployeeDashboardResponse.java → StudentDashboardResponse.java}

@@ -4,11 +4,12 @@ import org.springframework.data.domain.Page;
 
 import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 
-public record EmployeeDashboardResponse(
+public record StudentDashboardResponse(
 
         Long totalReports,
         Long acceptedReports,
         Long rejectedReports,
+        String attendanceRate,
         Page<AttendanceResponse> attendanceHistory
 
 ) {

src/main/java/com/attendenceSystem/module/dashboard/mapper/response/DashboardResponseMapper.java

@@ -0,0 +1,29 @@
+package com.attendenceSystem.module.dashboard.mapper.response;
+
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Component;
+
+import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
+import com.attendenceSystem.module.dashboard.dto.response.AdminDashboardResponse;
+import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardResponse;
+import com.attendenceSystem.module.dashboard.dto.response.StudentDashboardResponse;
+
+@Component
+public class DashboardResponseMapper {
+
+    public AdminDashboardResponse toAdminDashboardResponse(long totalAccounts, long activeAccounts,
+            long inactiveAccounts, long pendingAccounts) {
+        return new AdminDashboardResponse(totalAccounts, activeAccounts, inactiveAccounts, pendingAccounts);
+    }
+
+    public ManagerDashboardResponse toManagerDashboardResponse(long totalEmployees, long attendedEmployees,
+            long absentEmployees, Page<AttendanceResponse> attendanceHistory) {
+        return new ManagerDashboardResponse(totalEmployees, attendedEmployees, absentEmployees, attendanceHistory);
+    }
+
+    public StudentDashboardResponse toStudentDashboardResponse(long totalReports, long acceptedReports,
+            long rejectedReports, String attendanceRate, Page<AttendanceResponse> attendanceHistory) {
+        return new StudentDashboardResponse(totalReports, acceptedReports, rejectedReports, attendanceRate,
+                attendanceHistory);
+    }
+}

src/main/java/com/attendenceSystem/module/dashboard/service/DashboardService.java

@@ -1,7 +1,7 @@
 package com.attendenceSystem.module.dashboard.service;
 
 import com.attendenceSystem.module.dashboard.dto.response.AdminDashboardResponse;
-import com.attendenceSystem.module.dashboard.dto.response.EmployeeDashboardResponse;
+import com.attendenceSystem.module.dashboard.dto.response.StudentDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardResponse;
 
 public interface DashboardService {
@@ -9,7 +9,7 @@ public interface DashboardService {
 
     ManagerDashboardResponse getManagerDashboard();
 
-    EmployeeDashboardResponse getEmployeeDashboard();
+    StudentDashboardResponse getStudentDashboard();
 
 }
 

src/main/java/com/attendenceSystem/module/dashboard/service/impl/DashboardServiceImpl.java

@@ -9,10 +9,13 @@ import org.springframework.stereotype.Service;
 import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 import com.attendenceSystem.module.attendance.mapper.response.AttendanceResponseMapper;
 import com.attendenceSystem.module.attendance.repository.AttendanceRecordRepository;
+import com.attendenceSystem.module.attendance.util.AttendanceCalculator;
 import com.attendenceSystem.module.dashboard.dto.response.AdminDashboardResponse;
-import com.attendenceSystem.module.dashboard.dto.response.EmployeeDashboardResponse;
+import com.attendenceSystem.module.dashboard.dto.response.StudentDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardResponse;
+import com.attendenceSystem.module.dashboard.mapper.response.DashboardResponseMapper;
 import com.attendenceSystem.module.dashboard.service.DashboardService;
+import com.attendenceSystem.module.dashboard.util.DashboardCalculator;
 import com.attendenceSystem.module.report.entity.enums.ReportStatus;
 import com.attendenceSystem.module.report.repository.ReportRepository;
 import com.attendenceSystem.module.user.entity.User;
@@ -29,6 +32,7 @@ public class DashboardServiceImpl implements DashboardService {
     private final AttendanceRecordRepository attendanceRecordRepository;
     private final ReportRepository reportRepository;
     private final AttendanceResponseMapper attendanceResponseMapper;
+    private final DashboardResponseMapper dashboardResponseMapper;
 
     @Override
     public AdminDashboardResponse getAdminDashboard() {
@@ -36,7 +40,8 @@ public class DashboardServiceImpl implements DashboardService {
         long activeAccounts = userRepository.countByIsActiveTrue();
         long inactiveAccounts = userRepository.countByIsActiveFalse();
         long pendingAccounts = userRepository.countByMustChangePasswordTrue();
-        return new AdminDashboardResponse(totalAccounts, activeAccounts, inactiveAccounts, pendingAccounts);
+        return dashboardResponseMapper.toAdminDashboardResponse(totalAccounts, activeAccounts, inactiveAccounts,
+                pendingAccounts);
     }
 
     @Override
@@ -48,19 +53,24 @@ public class DashboardServiceImpl implements DashboardService {
         Page<AttendanceResponse> attendanceHistory = attendanceRecordRepository
                 .findAllByOrderByAttendanceDateDesc(PageRequest.of(0, 10))
                 .map(attendanceResponseMapper::fromEntity);
-        return new ManagerDashboardResponse(totalEmployees, attendedEmployees, absentEmployees, attendanceHistory);
+        return dashboardResponseMapper.toManagerDashboardResponse(totalEmployees, attendedEmployees, absentEmployees,
+                attendanceHistory);
     }
 
     @Override
-    public EmployeeDashboardResponse getEmployeeDashboard() {
+    public StudentDashboardResponse getStudentDashboard() {
         User user = getCurrentUser();
         long totalReports = reportRepository.countByEmployee(user);
         long acceptedReports = reportRepository.countByEmployeeAndStatus(user, ReportStatus.ACCEPTED);
         long rejectedReports = reportRepository.countByEmployeeAndStatus(user, ReportStatus.REJECTED);
+        long totalDays = attendanceRecordRepository.count();
+        long attendedDays = attendanceRecordRepository.countByCheckInTimeNotNullAndCheckOutTimeNotNull();
+        String attendenceRate = DashboardCalculator.showResultStr(attendedDays, totalDays);
         Page<AttendanceResponse> attendanceHistory = attendanceRecordRepository
                 .findByUser(user, PageRequest.of(0, 10))
                 .map(attendanceResponseMapper::fromEntity);
-        return new EmployeeDashboardResponse(totalReports, acceptedReports, rejectedReports, attendanceHistory);
+        return dashboardResponseMapper.toStudentDashboardResponse(totalReports, acceptedReports, rejectedReports,
+                attendenceRate, attendanceHistory);
     }
 
     private User getCurrentUser() {

src/main/java/com/attendenceSystem/module/dashboard/util/DashboardCalculator.java

@@ -0,0 +1,17 @@
+package com.attendenceSystem.module.dashboard.util;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class DashboardCalculator {
+    public double calculatePercent(long onTime, long total) {
+        if (total <= 0) {
+            return 0;
+        }
+        return (double) onTime / total * 100;
+    }
+
+    public String showResultStr(long onTime, long total) {
+        return String.format("%.2f%%", calculatePercent(onTime, total));
+    }
+}

src/main/java/com/attendenceSystem/module/faceid/controller/FaceProfileController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.attendenceSystem.constant.Routes;
+import com.attendenceSystem.constant.Views;
 import com.attendenceSystem.module.faceid.dto.request.CreateFaceProfileRequest;
 import com.attendenceSystem.module.faceid.service.FaceProfileService;
 
@@ -19,7 +20,7 @@ import lombok.RequiredArgsConstructor;
 
 @Controller
 @RequiredArgsConstructor
-@RequestMapping("/faceid")
+@RequestMapping(Routes.FaceId.ROOT)
 public class FaceProfileController {
 
     private final FaceProfileService faceProfileService;
@@ -29,22 +30,22 @@ public class FaceProfileController {
             @PageableDefault(size = 10) Pageable pageable,
             Model model) {
         model.addAttribute("faceProfiles", faceProfileService.searchFaceProfiles(query, pageable));
-        return "cms/face-id/faceID-list";
+        return Views.FaceId.LIST;
     }
 
     @GetMapping("/create")
     public String createForm(Model model) {
         model.addAttribute("createFaceProfileRequest", new CreateFaceProfileRequest());
-        return "cms/face-id/faceID-create";
+        return Views.FaceId.CREATE;
     }
 
     @PostMapping("/create")
     public String create(@Valid @ModelAttribute CreateFaceProfileRequest request,
             BindingResult result, Model model) {
         if (result.hasErrors()) {
-            return "cms/face-id/faceID-create";
+            return Views.FaceId.CREATE;
         }
         faceProfileService.createFaceProfile(request);
-        return Routes.REDIRECT + "/faceid";
+        return Routes.REDIRECT + Routes.FaceId.ROOT;
     }
 }

src/main/java/com/attendenceSystem/module/schedule/controller/ScheduleController.java

@@ -0,0 +1,23 @@
+package com.attendenceSystem.module.schedule.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.attendenceSystem.constant.Routes;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+@RequiredArgsConstructor
+@Controller
+@RequestMapping(Routes.Schedule.ROOT)
+public class ScheduleController {
+    @GetMapping
+    public String toSchedulePage(Model model) {
+        return new String();
+    }
+    
+}

src/main/java/com/attendenceSystem/module/user/controller/AuthController.java

@@ -1,7 +1,9 @@
 package com.attendenceSystem.module.user.controller;
 
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -10,12 +12,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.attendenceSystem.constant.Routes;
 import com.attendenceSystem.constant.Views;
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
 import com.attendenceSystem.module.user.dto.request.LoginRequest;
 import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 import com.attendenceSystem.module.user.service.AuthService;
 
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -73,7 +78,7 @@ public class AuthController {
             return switch (user.role()) {
                 case "ADMIN" -> Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.ADMIN;
                 case "MANAGER" -> Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.MANAGER;
-                case "STAFF" -> Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.EMPLOYEE;
+                case "STUDENT" -> Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.STUDENT;
                 default -> Routes.REDIRECT + Routes.Dashboard.ROOT;
             };
         } catch (AuthenticationException e) {
@@ -84,17 +89,17 @@ public class AuthController {
 
     @PostMapping(Routes.Auth.REGISTER)
     public String register(
-        @Valid @ModelAttribute RegisterRequest request,
-        BindingResult result,
-        Model model,
-        RedirectAttributes redirectAttributes) {
-        if(result.hasErrors()){
+            @Valid @ModelAttribute RegisterRequest request,
+            BindingResult result,
+            Model model,
+            RedirectAttributes redirectAttributes) {
+        if (result.hasErrors()) {
             return Views.Auth.REGISTER;
         }
         try {
             authService.register(request);
             redirectAttributes.addFlashAttribute("successMessage", "Đăng kí thành công");
-            return Routes.REDIRECT + Routes.Auth.ROOT+ Routes.Auth.LOGIN;
+            return Routes.REDIRECT + Routes.Auth.ROOT + Routes.Auth.LOGIN;
         } catch (IllegalArgumentException e) {
             request.setPassword("");
             request.setRePassword("");
@@ -102,5 +107,17 @@ public class AuthController {
             return Views.Auth.REGISTER;
         }
     }
-    
+
+    @PostMapping(Routes.Auth.LOGOUT)
+    public String logout(
+            HttpServletRequest request,
+            HttpServletResponse response) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null) {
+            new SecurityContextLogoutHandler()
+                    .logout(request, response, authentication);
+        }
+
+        return Routes.REDIRECT+"/";
+    }
 }

src/main/java/com/attendenceSystem/module/user/controller/UserController.java

@@ -22,14 +22,14 @@ public class UserController {
 
     @GetMapping
     public String toListPage(@PageableDefault(size = 10) Pageable pageable, Model model) {
-        model.addAttribute("accounts", userService.getAccounts(pageable));
+        model.addAttribute("users", userService.getUsers(pageable));
         return Views.User.LIST;
     }
 
     @GetMapping("/{id}")
     public String toDetailPage(@PathVariable("id") Long id, Model model) {
-        UserResponse account = userService.getById(id);
-        model.addAttribute("account", account);
+        UserResponse user = userService.getById(id);
+        model.addAttribute("user", user);
         return Views.User.DETAIL;
     }
 

src/main/java/com/attendenceSystem/module/user/entity/User.java

@@ -5,6 +5,7 @@ import java.time.Instant;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
+import com.attendenceSystem.module.user.entity.enums.Department;
 import com.attendenceSystem.module.user.entity.enums.Role;
 
 import jakarta.persistence.Column;
@@ -35,6 +36,8 @@ public class User {
     private String username;
     @Column(name = "email", unique = true, nullable = false, length = 255)
     private String email;
+    @Column(name = "phone", unique = true)
+    private String phone;
     @Column(name = "password", nullable = false, length = 255)
     private String password;
     @Column(name = "role", nullable = false)
@@ -44,13 +47,14 @@ public class User {
     private boolean isActive = true;
     @Column(name = "full_name", nullable = false, length = 255)
     private String fullName;
+    @Column(name = "department")
+    private Department department;
     @CreationTimestamp
     @Column(name = "created_at", nullable = false, updatable = false)
     private Instant createdAt;
     @UpdateTimestamp
     @Column(name = "updated_at", nullable = false)
     private Instant updatedAt;
-
     @Column(name = "must_change_password", nullable = false)
     @Builder.Default
     private boolean mustChangePassword = false;

src/main/java/com/attendenceSystem/module/user/entity/UserProfile.java

@@ -0,0 +1,5 @@
+package com.attendenceSystem.module.user.entity;
+
+public class UserProfile {
+
+}

src/main/java/com/attendenceSystem/module/user/entity/converter/DepartmentConverter.java

@@ -0,0 +1,21 @@
+package com.attendenceSystem.module.user.entity.converter;
+
+import com.attendenceSystem.module.user.entity.enums.Department;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class DepartmentConverter implements AttributeConverter<Department, Integer> {
+
+    @Override
+    public Integer convertToDatabaseColumn(Department attribute) {
+        return attribute == null ? null : attribute.value;
+    }
+
+    @Override
+    public Department convertToEntityAttribute(Integer dbData) {
+        return dbData == null ? null : Department.fromValue(dbData);
+    }
+
+}

src/main/java/com/attendenceSystem/module/user/entity/enums/Department.java

@@ -0,0 +1,21 @@
+package com.attendenceSystem.module.user.entity.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum Department {
+    SE(0);
+
+    public final int value;
+
+    public static Department fromValue(int value) {
+        for (Department d : Department.values()) {
+            if (d.value == value) {
+                return d;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/attendenceSystem/module/user/entity/enums/Role.java

@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor
 public enum Role {
-    ADMIN(1), MANAGER(2), STAFF(3), ;
+    ADMIN(1), MANAGER(2), STUDENT(3), ;
 
     public final int value;
     public static Role fromValue(int value){

src/main/java/com/attendenceSystem/module/user/mapper/request/RegisterRequestMapper.java

@@ -15,7 +15,7 @@ public final class RegisterRequestMapper {
                 .email(request.getEmail())
                 .password(hashPassword)
                 .fullName(request.getFullName())
-                .role(Role.STAFF)
+                .role(Role.STUDENT)
                 .mustChangePassword(false)
                 .build();
     }

src/main/java/com/attendenceSystem/module/user/service/UserService.java

@@ -6,7 +6,7 @@ import org.springframework.data.domain.Pageable;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 
 public interface UserService {
-    Page<UserResponse> getAccounts(Pageable pageable);
+    Page<UserResponse> getUsers(Pageable pageable);
     UserResponse getById(Long id);
     void deleteUser(Long id);
 }

src/main/java/com/attendenceSystem/module/user/service/impl/AuthServiceImpl.java

@@ -29,6 +29,7 @@ public class AuthServiceImpl implements AuthService {
     private final UserRepository userRepository;
     private final AuthenticationManager authenticationManager;
     private final PasswordEncoder passwordEncoder;
+    
 
     @Transactional
     @Override
@@ -44,6 +45,7 @@ public class AuthServiceImpl implements AuthService {
         userRepository.save(savedUser);
     }
 
+    @Transactional
     @Override
     public UserResponse login(LoginRequest request) {
 

src/main/java/com/attendenceSystem/module/user/service/impl/UserServiceImpl.java

@@ -36,8 +36,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public Page<UserResponse> getAccounts(Pageable pageable) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getAccounts'");
+    public Page<UserResponse> getUsers(Pageable pageable) {
+        return userRepository.findAll(pageable).map(userResponseMapper::fromEntity);
     }
 }

src/main/java/com/attendenceSystem/security/CustomUserDetails.java

@@ -0,0 +1,44 @@
+package com.attendenceSystem.security;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.entity.enums.Department;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class CustomUserDetails implements UserDetails {
+    private final Long id;
+    private final String username;
+    private final String password;
+    private final String fullName;
+    private final String email;
+    private final String phone;
+    private final String department;
+    private final String role;
+
+    public static CustomUserDetails fromUser(User user) {
+        return new CustomUserDetails(
+                user.getId(),
+                user.getUsername(),
+                user.getPassword(),
+                user.getFullName(),
+                user.getEmail(),
+                user.getPhone(),
+                user.getDepartment().name(),
+                user.getRole().name());
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return List.of(new SimpleGrantedAuthority("ROLE_"+role));
+    }
+}

src/main/java/com/attendenceSystem/security/CustomUserDetailsService.java

@@ -12,23 +12,17 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
-public class CustomUserDetailsService
-        implements UserDetailsService {
+public class CustomUserDetailsService implements UserDetailsService {
 
-    private final UserRepository userRepository;
+        private final UserRepository userRepository;
 
-    @Override
-    public UserDetails loadUserByUsername(String username)
-            throws UsernameNotFoundException {
+        @Override
+        public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
 
-        User user = userRepository
-                .findUserByUsernameOrEmail(username, username)
-                .orElseThrow(() -> new UsernameNotFoundException("Không tìm thấy User"));
+                User user = userRepository
+                                .findUserByUsernameOrEmail(username, username)
+                                .orElseThrow(() -> new UsernameNotFoundException("Không tìm thấy User"));
 
-        return org.springframework.security.core.userdetails.User
-                .withUsername(user.getUsername())
-                .password(user.getPassword())
-                .roles(user.getRole().name())
-                .build();
-    }
+                return CustomUserDetails.fromUser(user);
+        }
 }

src/main/java/com/attendenceSystem/security/SecurityConfig.java

@@ -13,6 +13,8 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
+import org.springframework.security.web.context.SecurityContextRepository;
 
 // import com.attendenceSystem.constant.Routes;
 // import com.attendenceSystem.entity.enums.Role;
@@ -46,7 +48,10 @@ public class SecurityConfig {
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http
                 .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/auth/**", "/login/**", "/css/**", "/js/**").permitAll()
+                        .requestMatchers("/dashboard/**").authenticated()
                         .anyRequest().permitAll())
+
                 .csrf(csrf -> csrf.disable());
         return http.build();
     }
@@ -55,6 +60,11 @@ public class SecurityConfig {
     public AuthenticationManager authenticationManager() throws Exception {
         return authenticationConfiguration.getAuthenticationManager();
     }
+
+    @Bean
+    public SecurityContextRepository securityContextRepository() {
+        return new HttpSessionSecurityContextRepository();
+    }
     // Chỉ dùng để test admin
     // @Bean
     // public UserDetailsService userDetailsService(

src/main/resources/static/js/api/auth/login.js

@@ -0,0 +1,6 @@
+import {post} from "../method.js"
+export async function login(request) {
+    return post(
+        "api/auth/login", request
+    );
+}

src/main/resources/static/js/api/auth/register.js

@@ -0,0 +1,5 @@
+import {post} from "../method.js"
+
+export async function register(request) {
+    return post("api/auth/register",request);
+}

src/main/resources/static/js/api/method.js

@@ -0,0 +1,30 @@
+async function post(url, body) {
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(body),
+  });
+  if (!response.ok) {
+    const err = await response.text();
+    throw new Error(err);
+  }
+  return await response.json();
+}
+
+async function get(url) {
+    const response = await fetch(
+      url, {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json"
+        }
+      }
+    );
+    if(!response.ok){
+      const err = await response.text();
+      throw new Error(err);
+    }
+    return response.json();
+}

src/main/resources/templates/cms/absent/absent-create.html

@@ -38,43 +38,18 @@
 
                     <div class="card-body">
 
-                        <form class="absent-form" method="post" th:action="@{/absent/create}">
-                            <!-- Phòng ban -->
-                            <div class="form-group">
-                                <label>Phòng ban</label>
-
-                                <select name="departmentId" required>
-                                    <option value="" disabled selected>Chọn phòng ban</option>
-
-                                    <option th:each="d : ${departments}" th:value="${d.id}" th:text="${d.name}">
-                                    </option>
-
-                                </select>
-                            </div>
-                            <!-- Loại nghỉ -->
-                            <div class="form-group">
-                                <label>Loại nghỉ phép</label>
-
-                                <select name="type" required>
-                                    <option value="" disabled selected>Chọn loại nghỉ phép</option>
-                                    <option value="PAID">Nghỉ có lương</option>
-                                    <option value="UNPAID">Nghỉ không lương</option>
-                                    <option value="SICK">Nghỉ bệnh</option>
-                                    <option value="ANNUAL">Nghỉ phép năm</option>
-                                </select>
-                            </div>
-
+                        <form class="absent-form" method="post" th:action="@{/attendance/leave/create}" th:object="${createLeaveRequest}">
                             <!-- Date -->
                             <div class="form-grid">
 
                                 <div class="form-group">
                                     <label>Từ ngày</label>
-                                    <input type="date" name="startDate" required>
+                                    <input type="date" th:field="*{startDate}" required>
                                 </div>
 
                                 <div class="form-group">
                                     <label>Đến ngày</label>
-                                    <input type="date" name="endDate" required>
+                                    <input type="date" th:field="*{endDate}" required>
                                 </div>
 
                             </div>
@@ -82,7 +57,7 @@
                             <!-- Lý do -->
                             <div class="form-group">
                                 <label>Lý do</label>
-                                <textarea name="reason" rows="5" placeholder="Nhập lý do xin nghỉ..."
+                                <textarea th:field="*{reason}" rows="5" placeholder="Nhập lý do xin nghỉ..."
                                     required></textarea>
                             </div>
 

src/main/resources/templates/cms/absent/absent-list.html

@@ -109,17 +109,22 @@
                                 </thead>
 
                                 <tbody>
-
-                                    <tr>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-
+                                    <!-- Không có dữ liệu -->
+                                    <tr th:if="${leaveRequests == null or leaveRequests.content.isEmpty()}">
+                                        <td colspan="7" class="text-center">
+                                            Chưa có đơn nghỉ phép nào.
+                                        </td>
+                                    </tr>
+                                    <tr th:each="leave : ${leaveRequests.content}">
+                                        <td th:text="${leave.fullName()}">Nhân viên</td>
+                                        <td>Phòng ban</td>
+                                        <td>CỘT NÀY SAI NGHIỆP VỤ. NÓ NÊN NẰM Ở DETAILS</td>
+                                        <td th:text="${leave.startDate()}">Từ ngày</td>
+                                        <td th:text="${leave.endDate()}">Đến ngày</td>
+                                        <td>Cột này nên nhét vào hành động. Phê duyệt và từ chối nên nhét vào details</td>
+                                        
                                         <td>
-                                            <span class="status pending">Chờ duyệt</span>
+                                            <span class="status pending">Trạng thái</span>
                                         </td>
 
                                         <td>

src/main/resources/templates/cms/account/account-list.html

@@ -45,16 +45,19 @@
                         </thead>
 
                         <tbody>
-                            <tr>
+                            <tr th:if="${users == null or users.content.isEmpty()}">
+                                <td colspan="5">Chưa có tài khoản nào.</td>
+                            </tr>
+                            <tr th:each="users : ${users.content}">
                                 <td>
                                     <div class="user">
                                         <div class="avatar">A</div>
-                                        <strong>Nguyễn Văn A</strong>
+                                        <strong th:text="${users.fullName()}">Nguyễn Văn A</strong>
                                     </div>
                                 </td>
-                                <td>nguyenvana@company.com</td>
-                                <td><span class="role">Nhân viên</span></td>
-                                <td><span class="status active">Hoạt động</span></td>
+                                <td th:text="${users.email()}">nguyenvana@company.com</td>
+                                <td ><span th:text="${users.role()}" class="role">Nhân viên</span></td>
+                                <td><span th:text="${users.isActive()} == true?'Hoạt động':'Ngừng hoạt động'" class="status active">Hoạt động</span></td>
                                 <td>
                                     <div class="actions">
                                         <button class="icon-btn btn-role">Đổi quyền</button>

src/main/resources/templates/cms/dashboard/dashboard-employee.html

@@ -217,17 +217,17 @@
 
                             <div class="profile-item">
                                 <label>Email</label>
-                                <span>nguyenvana@company.com</span>
+                                <span th:text="${#authentication.principal.email}"></span>
                             </div>
 
                             <div class="profile-item">
                                 <label>Số điện thoại</label>
-                                <span>0123456789</span>
+                                <span th:text="${#authentication.principal.phone}"></span>
                             </div>
 
                             <div class="profile-item">
                                 <label>Phòng ban</label>
-                                <span>IT Department</span>
+                                <span th:text="${#authentication.principal.department}">IT Department</span>
                             </div>
 
                             <div class="profile-item">

src/main/resources/templates/cms/sidebar/sidebar-admin.html

@@ -16,14 +16,14 @@
     <ul class="sidebar-menu">
 
         <li class="sidebar-option">
-            <a href="/dashboardAdmin" class="sidebar-link">
+            <a href="/dashboard/admin" class="sidebar-link">
                 <span>📊</span>
                 Dashboard
             </a>
         </li>
 
         <li class="sidebar-option">
-            <a href="/accountList" class="sidebar-link">
+            <a href="/user" class="sidebar-link">
                 <span>👥</span>
                 Quản lý tài khoản
             </a>
@@ -49,17 +49,21 @@
     <div class="sidebar-footer">
 
         <div class="footer-user">
-            <div class="avatar">N</div>
+            <div class="avatar"></div>
 
             <div>
-                <h3>Nguyễn Thị B</h3>
-                <div class="header-description">Quản lý</div>
+                <h3 th:text="${#authentication.principal.fullName}"></h3>
+                <div class="header-description" th:text="${#authentication.principal.role}">
+                    Vai trò
+                </div>
             </div>
         </div>
 
-        <a href="/" class="logout">
-            🚪 Đăng xuất
-        </a>
+        <form th:action="@{/auth/logout}" method="post" class="logout-form">
+            <button type="submit" class="logout">
+                🚪 Đăng xuất
+            </button>
+        </form>
 
     </div>
 </div>

src/main/resources/templates/cms/sidebar/sidebar-employee.html

@@ -16,28 +16,28 @@
     <ul class="sidebar-menu">
 
         <li class="sidebar-option">
-            <a href="/dashboardEmployee" class="sidebar-link">
+            <a href="/dashboard/student" class="sidebar-link">
                 <span>📊</span>
                 Dashboard
             </a>
         </li>
 
         <li class="sidebar-option">
-            <a href="/attendanceHistory" class="sidebar-link">
+            <a href="/attendance/history" class="sidebar-link">
                 <span>🕒</span>
                 Lịch sử điểm danh
             </a>
         </li>
 
         <li class="sidebar-option">
-            <a href="/absentCreate" class="sidebar-link">
+            <a href="/attendance/leave/create" class="sidebar-link">
                 <span>📅</span>
                 Xin nghỉ phép
             </a>
         </li>
 
         <li class="sidebar-option">
-            <a href="/faceIDCreate" class="sidebar-link">
+            <a href="/face-id/create" class="sidebar-link">
                 <span>👤</span>
                 Đăng kí Face ID
             </a>
@@ -72,14 +72,18 @@
             <div class="avatar"></div>
 
             <div>
-                <h3>Nguyễn Thị B</h3>
-                <div class="header-description">Quản lý</div>
+                <h3 th:text="${#authentication.principal.fullName}"></h3>
+                <div class="header-description" th:text="${#authentication.principal.role}">
+                    Vai trò
+                </div>
             </div>
         </div>
 
-        <a  href="/" class="logout">
-            🚪 Đăng xuất
-        </a>
+        <form th:action="@{/auth/logout}" method="post" class="logout-form">
+            <button type="submit" class="logout">
+                🚪 Đăng xuất
+            </button>
+        </form>
 
     </div>
 </div>

src/main/resources/templates/cms/sidebar/sidebar-manage.html

@@ -16,14 +16,14 @@
     <ul class="sidebar-menu">
 
         <li class="sidebar-option">
-            <a href="/dashboardManager" class="sidebar-link">
+            <a href="/dashboard/manager" class="sidebar-link">
                 <span>📊</span>
                 Dashboard
             </a>
         </li>
 
         <li class="sidebar-option">
-            <a href="/attendances" class="sidebar-link">
+            <a href="/attendance" class="sidebar-link">
                 <span>🕒</span>
                 Quản lý điểm danh
             </a>
@@ -37,7 +37,7 @@
         </li>
 
         <li class="sidebar-option">
-            <a href="/absentList" class="sidebar-link">
+            <a href="/attendance/leave" class="sidebar-link">
                 <span>📅</span>
                 Duyệt nghỉ phép
             </a>
@@ -59,17 +59,21 @@
     <div class="sidebar-footer">
 
         <div class="footer-user">
-            <div class="avatar">N</div>
+            <div class="avatar"></div>
 
             <div>
-                <h3>Nguyễn Thị B</h3>
-                <div class="header-description">Quản lý</div>
+                <h3 th:text="${#authentication.principal.fullName}"></h3>
+                <div class="header-description" th:text="${#authentication.principal.role}">
+                    Vai trò
+                </div>
             </div>
         </div>
 
-        <a href="/" class="logout">
-            🚪 Đăng xuất
-        </a>
+        <form th:action="@{/auth/logout}" method="post" class="logout-form">
+            <button type="submit" class="logout">
+                🚪 Đăng xuất
+            </button>
+        </form>
 
     </div>