diff --git a/pom.xml b/pom.xml
index e0214c39a60bbab4441036ca9f80289dd052d647..0bc83f38e08b35b340128847d505da6f15fecd7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +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">
+<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -34,6 +35,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency> -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
diff --git a/src/main/java/com/attendenceSystem/constant/Routes.java b/src/main/java/com/attendenceSystem/constant/Routes.java
new file mode 100644
index 0000000000000000000000000000000000000000..020d19e5dbb36541a1fe6692393228b5b5c0ecc2
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/constant/Routes.java
@@ -0,0 +1,13 @@
+package com.attendenceSystem.constant;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class Routes {
+    public static final class Auth {
+        public static final String ROOT = "/auth";
+        public static final String LOGIN = "/login";
+        public static final String REGISTER = "/register";
+    }
+}
diff --git a/src/main/java/com/attendenceSystem/exception/GlobalExceptionHandler.java b/src/main/java/com/attendenceSystem/exception/GlobalExceptionHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..910317cb08d372229975c0fb31952a3edac76247
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/exception/GlobalExceptionHandler.java
@@ -0,0 +1,41 @@
+// package com.attendenceSystem.exception;
+
+// import org.springframework.http.HttpStatus;
+// import org.springframework.security.access.AccessDeniedException;
+// import org.springframework.web.bind.annotation.ControllerAdvice;
+// import org.springframework.web.bind.annotation.ExceptionHandler;
+// import org.springframework.web.bind.annotation.ResponseStatus;
+
+// import com.attendenceSystem.exception.custom.BadRequestException;
+// import com.attendenceSystem.exception.custom.ResourceNotFoundException;
+
+// @ControllerAdvice
+// public class GlobalExceptionHandler {
+//     @ExceptionHandler(ResourceNotFoundException.class)
+//     @ResponseStatus(HttpStatus.NOT_FOUND)
+//     public String notFound() {
+//         return "error/404";
+//     }
+
+//     @ExceptionHandler(AccessDeniedException.class)
+//     @ResponseStatus(HttpStatus.FORBIDDEN)
+//     public String forbidden() {
+//         return "error/403";
+//     }
+
+//     @ExceptionHandler(BadRequestException.class)
+//     @ResponseStatus(HttpStatus.BAD_REQUEST)
+//     public String badRequest() {
+//         return "error/400";
+//     }
+
+//     @ExceptionHandler(Exception.class)
+//     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+//     public String internalServerError(Exception ex) {
+
+//         ex.printStackTrace();
+
+//         return "error/500";
+//     }
+
+// }
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/exception/custom/BadRequestException.java b/src/main/java/com/attendenceSystem/exception/custom/BadRequestException.java
new file mode 100644
index 0000000000000000000000000000000000000000..d7d45dfc00c4687e9e1a32e9827363996d6cebce
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/exception/custom/BadRequestException.java
@@ -0,0 +1,7 @@
+package com.attendenceSystem.exception.custom;
+
+public class BadRequestException extends RuntimeException{
+    public BadRequestException(String message){
+        super(message);
+    }
+}
diff --git a/src/main/java/com/attendenceSystem/exception/custom/ResourceNotFoundException.java b/src/main/java/com/attendenceSystem/exception/custom/ResourceNotFoundException.java
new file mode 100644
index 0000000000000000000000000000000000000000..07c9d0f1ffeeb3f69ebd71e1f2903d29405fe57e
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/exception/custom/ResourceNotFoundException.java
@@ -0,0 +1,7 @@
+package com.attendenceSystem.exception.custom;
+
+public class ResourceNotFoundException extends RuntimeException{
+    public ResourceNotFoundException(String message){
+        super(message);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/module/log/dto/request/AuditLogRequest.java b/src/main/java/com/attendenceSystem/module/log/dto/request/AuditLogRequest.java
new file mode 100644
index 0000000000000000000000000000000000000000..e56d8c11f7e0552daa0c601509943f9af19c99ae
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/dto/request/AuditLogRequest.java
@@ -0,0 +1,14 @@
+package com.attendenceSystem.module.log.dto.request;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+import com.attendenceSystem.module.user.entity.User;
+
+public record AuditLogRequest(
+        User user,
+        LogEntityType logEntityType,
+        Long entityId,
+        LogAction action,
+        String description) {
+
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/dto/response/AuditLogResponse.java b/src/main/java/com/attendenceSystem/module/log/dto/response/AuditLogResponse.java
new file mode 100644
index 0000000000000000000000000000000000000000..6697f0bf705a87e21db7607349962c62d88c0568
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/dto/response/AuditLogResponse.java
@@ -0,0 +1,18 @@
+package com.attendenceSystem.module.log.dto.response;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+
+import lombok.Builder;
+
+@Builder
+public record AuditLogResponse(
+                Long id,
+                Long userId,
+                String username,
+                LogEntityType entityType,
+                Long entityId,
+                LogAction action,
+                String description,
+                String createdAt) {
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/entity/AuditLog.java b/src/main/java/com/attendenceSystem/module/log/entity/AuditLog.java
new file mode 100644
index 0000000000000000000000000000000000000000..ebf5e78fa22b768365814afe73119d6db1a30926
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/entity/AuditLog.java
@@ -0,0 +1,58 @@
+package com.attendenceSystem.module.log.entity;
+
+import java.time.Instant;
+
+import org.hibernate.annotations.CreationTimestamp;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+import com.attendenceSystem.module.user.entity.User;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "audit_logs")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AuditLog {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "entity_id")
+    private Long entityId;
+
+    @Column(name = "entity_type", nullable = false)
+    private LogEntityType entityType;
+
+    @Column(name = "action", nullable = false)
+    private LogAction action;
+
+    @Column(name = "description", columnDefinition = "LONGTEXT")
+    private String description;
+
+    @CreationTimestamp
+    @Column(name = "created_at", updatable = false)
+    private Instant createdAt;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", updatable = false)
+    private User user;
+}
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/module/log/entity/converter/LogActionConverter.java b/src/main/java/com/attendenceSystem/module/log/entity/converter/LogActionConverter.java
new file mode 100644
index 0000000000000000000000000000000000000000..6d8224a607977dc2cf2fab428bf1e938cac2f769
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/entity/converter/LogActionConverter.java
@@ -0,0 +1,21 @@
+package com.attendenceSystem.module.log.entity.converter;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class LogActionConverter implements AttributeConverter<LogAction, Long> {
+
+    @Override
+    public Long convertToDatabaseColumn(LogAction attribute) {
+        return attribute == null ? null : attribute.getCode();
+    }
+
+    @Override
+    public LogAction convertToEntityAttribute(Long dbData) {
+        return dbData == null ? null : LogAction.fromValue(dbData);
+    }
+
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/entity/converter/LogEntityTypeConverter.java b/src/main/java/com/attendenceSystem/module/log/entity/converter/LogEntityTypeConverter.java
new file mode 100644
index 0000000000000000000000000000000000000000..6c00a0b51e8b210cfe7b241ba6f7c3823333b503
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/entity/converter/LogEntityTypeConverter.java
@@ -0,0 +1,21 @@
+package com.attendenceSystem.module.log.entity.converter;
+
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class LogEntityTypeConverter implements AttributeConverter<LogEntityType, Long>{
+
+    @Override
+    public Long convertToDatabaseColumn(LogEntityType attribute) {
+        return attribute == null ? null : attribute.getCode();
+    }
+
+    @Override
+    public LogEntityType convertToEntityAttribute(Long dbData) {
+        return dbData == null ? null : LogEntityType.fromValue(dbData);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/module/log/entity/enums/LogAction.java b/src/main/java/com/attendenceSystem/module/log/entity/enums/LogAction.java
new file mode 100644
index 0000000000000000000000000000000000000000..dcced205fc9ff2d47372bccef96b3908a7e966ef
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/entity/enums/LogAction.java
@@ -0,0 +1,31 @@
+package com.attendenceSystem.module.log.entity.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum LogAction {
+    CREATE(1),
+    UPDATE(2),
+    DELETE(3),
+    RESTORE(4),
+    APPROVE(5),
+    LOCK(6),
+    UNLOCK(7),
+    CHANGE_PASSWORD(8),
+    LOGIN(9),
+    LOGOUT(10),
+    PROCESS(11);
+
+    private final long code;
+
+    public static LogAction fromValue(long code) {
+        for (LogAction action : LogAction.values()) {
+            if (action.code == code) {
+                return action;
+            }
+        }
+        throw new IllegalArgumentException("Không tìm thấy loại hành động: " + code);
+    }
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/entity/enums/LogEntityType.java b/src/main/java/com/attendenceSystem/module/log/entity/enums/LogEntityType.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf97d347f8d649b5bc964897327c97df759c3e0f
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/entity/enums/LogEntityType.java
@@ -0,0 +1,20 @@
+package com.attendenceSystem.module.log.entity.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum LogEntityType {
+    USER(1);
+
+    private final long code;
+        public static LogEntityType fromValue(long code) {
+        for (LogEntityType action : LogEntityType.values()) {
+            if (action.code == code) {
+                return action;
+            }
+        }
+        throw new IllegalArgumentException("Không tìm thấy loại Entity: " + code);
+    }
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/mapper/request/AuditLogRequestMapping.java b/src/main/java/com/attendenceSystem/module/log/mapper/request/AuditLogRequestMapping.java
new file mode 100644
index 0000000000000000000000000000000000000000..e9a993e1597c6dccbc1b2a786454e420d377d94c
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/mapper/request/AuditLogRequestMapping.java
@@ -0,0 +1,5 @@
+package com.attendenceSystem.module.log.mapper.request;
+
+public class AuditLogRequestMapping {
+
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/mapper/response/AuditLogResponseMapper.java b/src/main/java/com/attendenceSystem/module/log/mapper/response/AuditLogResponseMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..4bc88806b568e524d52ab2ff522c84df5aedb402
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/mapper/response/AuditLogResponseMapper.java
@@ -0,0 +1,20 @@
+package com.attendenceSystem.module.log.mapper.response;
+
+import com.attendenceSystem.module.log.dto.response.AuditLogResponse;
+import com.attendenceSystem.module.log.entity.AuditLog;
+import com.attendenceSystem.util.TimeUtil;
+
+public class AuditLogResponseMapper {
+        public static AuditLogResponse fromEntity(AuditLog auditLog) {
+                return AuditLogResponse.builder()
+                                .id(auditLog.getId())
+                                .userId(auditLog.getUser().getId())
+                                .username(auditLog.getUser().getUsername())
+                                .entityType(auditLog.getEntityType())
+                                .entityId(auditLog.getEntityId())
+                                .action(auditLog.getAction())
+                                .description(auditLog.getDescription())
+                                .createdAt(TimeUtil.formatInstant(auditLog.getCreatedAt(), null))
+                                .build();
+        }
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/repository/AuditLogRepository.java b/src/main/java/com/attendenceSystem/module/log/repository/AuditLogRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee7c16703e108704f71099f5ebfc17c0a1f2291a
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/repository/AuditLogRepository.java
@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.log.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.attendenceSystem.module.log.entity.AuditLog;
+
+@Repository
+public interface AuditLogRepository extends JpaRepository<AuditLog, Long> {
+    Page<AuditLog> findAllByOrderByCreatedAtDesc(Pageable pageable);
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/service/AuditLogService.java b/src/main/java/com/attendenceSystem/module/log/service/AuditLogService.java
new file mode 100644
index 0000000000000000000000000000000000000000..e812abfed4119fb7af57ad0be624097ec6af270d
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/service/AuditLogService.java
@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.log.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.attendenceSystem.module.log.dto.request.AuditLogRequest;
+import com.attendenceSystem.module.log.dto.response.AuditLogResponse;
+
+public interface AuditLogService {
+    void log(AuditLogRequest request);
+
+    Page<AuditLogResponse> getLogs(Pageable pageable);
+}
diff --git a/src/main/java/com/attendenceSystem/module/log/service/impl/AuditLogServiceImpl.java b/src/main/java/com/attendenceSystem/module/log/service/impl/AuditLogServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..879832fabd40b4c54707ec3894d78e4fade34693
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/log/service/impl/AuditLogServiceImpl.java
@@ -0,0 +1,40 @@
+package com.attendenceSystem.module.log.service.impl;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.attendenceSystem.module.log.dto.request.AuditLogRequest;
+import com.attendenceSystem.module.log.dto.response.AuditLogResponse;
+import com.attendenceSystem.module.log.entity.AuditLog;
+import com.attendenceSystem.module.log.mapper.response.AuditLogResponseMapper;
+import com.attendenceSystem.module.log.repository.AuditLogRepository;
+import com.attendenceSystem.module.log.service.AuditLogService;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class AuditLogServiceImpl implements AuditLogService {
+    private final AuditLogRepository auditLogRepository;
+
+    @Transactional
+    @Override
+    public void log(AuditLogRequest request) {
+        AuditLog auditLog = AuditLog.builder()
+                .user(request.user())
+                .entityType(request.logEntityType())
+                .entityId(request.entityId())
+                .action(request.action())
+                .description(request.description())
+                .build();
+        auditLogRepository.save(auditLog);
+    }
+
+    @Override
+    public Page<AuditLogResponse> getLogs(Pageable pageable) {
+        return auditLogRepository
+                .findAll(pageable)
+                .map(AuditLogResponseMapper::fromEntity);
+    }
+
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/controller/AuthController.java b/src/main/java/com/attendenceSystem/module/user/controller/AuthController.java
new file mode 100644
index 0000000000000000000000000000000000000000..d7d943f41a250974c5f2184334bdfbffe9d1bf75
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/controller/AuthController.java
@@ -0,0 +1,25 @@
+package com.attendenceSystem.module.user.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.attendenceSystem.constant.Routes;
+import com.attendenceSystem.module.user.service.AuthService;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+
+
+
+@Controller
+@RequestMapping(Routes.Auth.ROOT)
+@RequiredArgsConstructor
+public class AuthController {
+    private final AuthService authService;
+
+    @GetMapping(Routes.Auth.REGISTER)
+    public String toRegisterPage() {
+        return "auth/register";
+    }
+    
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/dto/request/LoginRequest.java b/src/main/java/com/attendenceSystem/module/user/dto/request/LoginRequest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4b2fd0b3bf967e4a96024ee280620b5f1830f98e
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/dto/request/LoginRequest.java
@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.user.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record LoginRequest(
+        @NotBlank(message = "Tên đăng nhập hoặc email không được để trống")
+        String login,
+
+        @NotBlank(message = "Mật khẩu không được để trống")
+        @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
+        String password) {
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/dto/request/RegisterRequest.java b/src/main/java/com/attendenceSystem/module/user/dto/request/RegisterRequest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9ec1cce629ba7302889466777a2e960a4813c8c5
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/dto/request/RegisterRequest.java
@@ -0,0 +1,37 @@
+package com.attendenceSystem.module.user.dto.request;
+
+import com.attendenceSystem.annotation.PasswordMatch;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
+@PasswordMatch
+public record RegisterRequest(
+
+        @NotBlank(message = "Tên đăng nhập không được để trống")
+        @Size(min = 3, max = 30, message = "Tên đăng nhập phải có độ dài từ 3 đến 30 ký tự")
+        @Pattern(regexp = "^[a-zA-Z0-9]+$", message = "Tên đăng nhập không được chứa ký tự đặc biệt")
+        String username,
+
+        @NotBlank(message = "Email không được để trống")
+        @Size(max = 255, message = "Email không được vượt quá 255 ký tự")
+        @Email(message = "Email không đúng định dạng")
+        String email,
+
+        @NotBlank(message = "Mật khẩu không được để trống")
+        @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
+        String password,
+
+        @NotBlank(message = "Mật khẩu xác nhận không được để trống")
+        @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+        String rePassword,
+
+        @NotBlank(message = "Họ tên không được để trống")
+        @Size(max = 255, message = "Họ tên không được vượt quá 255 ký tự")
+        String fullName
+
+) {
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/dto/response/UserResponse.java b/src/main/java/com/attendenceSystem/module/user/dto/response/UserResponse.java
new file mode 100644
index 0000000000000000000000000000000000000000..6196728a9c8f7dbe3308d67f950ce269aa052c8f
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/dto/response/UserResponse.java
@@ -0,0 +1,14 @@
+package com.attendenceSystem.module.user.dto.response;
+
+import lombok.Builder;
+
+@Builder
+public record UserResponse(
+        Long id,
+        String username,
+        String email,
+        String fullName,
+        Boolean isActive,
+        String role) {
+
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/entity/User.java b/src/main/java/com/attendenceSystem/module/user/entity/User.java
new file mode 100644
index 0000000000000000000000000000000000000000..fe38353503909efe792f5cb8f6cb6c8536332bcd
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/entity/User.java
@@ -0,0 +1,57 @@
+package com.attendenceSystem.module.user.entity;
+
+import java.time.Instant;
+
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import com.attendenceSystem.module.user.entity.enums.Role;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity
+@Table(name = "users")
+public class User {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "username", unique = true, nullable = false, length = 30)
+    private String username;
+    @Column(name = "email", unique = true, nullable = false, length = 255)
+    private String email;
+    @Column(name = "password", nullable = false, length = 255)
+    private String password;
+    @Column(name = "role", nullable = false)
+    private Role role;
+    @Column(name = "is_active", nullable = false)
+    @Builder.Default
+    private boolean isActive = true;
+    @Column(name = "full_name", nullable = false, length = 255)
+    private String fullName;
+    @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;
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/entity/converter/RoleConverter.java b/src/main/java/com/attendenceSystem/module/user/entity/converter/RoleConverter.java
new file mode 100644
index 0000000000000000000000000000000000000000..20a3df6914734c8d8d26c24e0d22d48366551e5c
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/entity/converter/RoleConverter.java
@@ -0,0 +1,20 @@
+package com.attendenceSystem.module.user.entity.converter;
+
+import com.attendenceSystem.module.user.entity.enums.Role;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class RoleConverter implements AttributeConverter<Role, Integer> {
+
+    @Override
+    public Integer convertToDatabaseColumn(Role role) {
+        return role == null ? null : role.getValue();
+    }
+
+    @Override
+    public Role convertToEntityAttribute(Integer dbData) {
+        return dbData == null ? null : Role.fromValue(dbData);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/user/entity/enums/Role.java b/src/main/java/com/attendenceSystem/module/user/entity/enums/Role.java
similarity index 89%
rename from src/main/java/com/attendenceSystem/user/entity/enums/Role.java
rename to src/main/java/com/attendenceSystem/module/user/entity/enums/Role.java
index a73799070127663b716635055803976b5751821c..d4fee264d997dd936b043d8fdcf9f3a02bda0ff4 100644
--- a/src/main/java/com/attendenceSystem/user/entity/enums/Role.java
+++ b/src/main/java/com/attendenceSystem/module/user/entity/enums/Role.java
@@ -1,4 +1,4 @@
-package com.attendenceSystem.user.entity.enums;
+package com.attendenceSystem.module.user.entity.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/attendenceSystem/module/user/mapper/request/RegisterRequestMapper.java b/src/main/java/com/attendenceSystem/module/user/mapper/request/RegisterRequestMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..83a04d2bb6e731c32dc8040197e4eccf440e344b
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/mapper/request/RegisterRequestMapper.java
@@ -0,0 +1,19 @@
+package com.attendenceSystem.module.user.mapper.request;
+
+import com.attendenceSystem.module.user.dto.request.RegisterRequest;
+import com.attendenceSystem.module.user.entity.User;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class RegisterRequestMapper {
+    public static User toEntity(RegisterRequest request, String hashPassword) {
+        return User.builder()
+                .username(request.username())
+                .email(request.email())
+                .password(hashPassword)
+                .fullName(request.fullName())
+                .build();
+    }
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/mapper/response/UserResponseMapper.java b/src/main/java/com/attendenceSystem/module/user/mapper/response/UserResponseMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..00e4d6048a7d9af5f98905d2000f5029c959123e
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/mapper/response/UserResponseMapper.java
@@ -0,0 +1,28 @@
+package com.attendenceSystem.module.user.mapper.response;
+
+import java.time.ZoneId;
+
+import org.springframework.stereotype.Component;
+
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.User;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class UserResponseMapper {
+
+    private final ZoneId applicationZoneId;
+
+    public UserResponse fromEntity(User user) {
+        return UserResponse.builder()
+                .id(user.getId())
+                .username(user.getUsername())
+                .email(user.getEmail())
+                .fullName(user.getFullName())
+                .isActive(user.isActive())
+                .role(user.getRole().name())
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/module/user/repository/UserRepository.java b/src/main/java/com/attendenceSystem/module/user/repository/UserRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..f7a7d63c5971b75e60ab04255cde21fa4033e7d1
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/repository/UserRepository.java
@@ -0,0 +1,24 @@
+package com.attendenceSystem.module.user.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.attendenceSystem.module.user.entity.User;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findUserByUsername(String username);
+    Optional<User> findUserByEmail(String email);
+    boolean existsByUsername(String username);
+    boolean existsByEmail(String email);
+    Optional<User> findUserByUsernameOrEmail(String username, String email);
+    boolean existsByUsernameOrEmail(String username, String email);
+    Page<User> findAllByOrderByIdAsc(Pageable pageable);
+    long countByIsActiveTrue();
+    long countByIsActiveFalse();
+    Optional<User> findByUsername(String username);
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/service/AuthService.java b/src/main/java/com/attendenceSystem/module/user/service/AuthService.java
new file mode 100644
index 0000000000000000000000000000000000000000..30f774edf70cca332ca1a338c42248399ffe2b29
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/service/AuthService.java
@@ -0,0 +1,12 @@
+package com.attendenceSystem.module.user.service;
+
+import com.attendenceSystem.module.user.dto.request.LoginRequest;
+import com.attendenceSystem.module.user.dto.request.RegisterRequest;
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+
+public interface AuthService {
+    UserResponse login(LoginRequest request);
+
+    void register(RegisterRequest request);
+
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/service/UserService.java b/src/main/java/com/attendenceSystem/module/user/service/UserService.java
new file mode 100644
index 0000000000000000000000000000000000000000..29cd05821fdfd193033741f14d525e6abfc4493b
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/service/UserService.java
@@ -0,0 +1,12 @@
+package com.attendenceSystem.module.user.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+
+public interface UserService {
+    Page<UserResponse> getAccounts(Pageable pageable);
+    UserResponse getById(Long id);
+    void deleteUser(Long id);
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/service/impl/AuthServiceImpl.java b/src/main/java/com/attendenceSystem/module/user/service/impl/AuthServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..2373209ec3d775f9a58006c88a0e8aede8ad523a
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/service/impl/AuthServiceImpl.java
@@ -0,0 +1,72 @@
+package com.attendenceSystem.module.user.service.impl;
+
+import com.attendenceSystem.module.user.mapper.request.RegisterRequestMapper;
+import com.attendenceSystem.module.user.mapper.response.UserResponseMapper;
+import java.util.Optional;
+
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+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.entity.User;
+import com.attendenceSystem.module.user.repository.UserRepository;
+import com.attendenceSystem.module.user.service.AuthService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AuthServiceImpl implements AuthService {
+    private final UserResponseMapper userResponseMapper;
+    private final UserRepository userRepository;
+    private final AuthenticationManager authenticationManager;
+    private final PasswordEncoder passwordEncoder;
+
+    @Transactional
+    @Override
+    public void register(RegisterRequest request) {
+        if (existsByKeyword(request.username())) {
+            throw new IllegalArgumentException("Tên đăng nhập đã tồn tại!");
+        }
+        if (existsByKeyword(request.email())) {
+            throw new IllegalArgumentException("Email này đã được đăng ký!");
+        }
+        String hashPassword = passwordEncoder.encode(request.password());
+        User savedUser = RegisterRequestMapper.toEntity(request, hashPassword);
+        userRepository.save(savedUser);
+    }
+
+    @Override
+    public UserResponse login(LoginRequest request) {
+
+        Authentication authentication = authenticationManager.authenticate(
+                new UsernamePasswordAuthenticationToken(
+                        request.login(),
+                        request.password()));
+
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        context.setAuthentication(authentication);
+        SecurityContextHolder.setContext(context);
+
+        User user = findUser(authentication.getName())
+                .orElseThrow(() -> new IllegalArgumentException(
+                        "Tên đăng nhập hoặc mật khẩu không đúng."));
+        return userResponseMapper.fromEntity(user);
+    }
+
+    private Optional<User> findUser(String keyword) {
+        return userRepository.findUserByUsernameOrEmail(keyword, keyword);
+    }
+
+    private boolean existsByKeyword(String keyword) {
+        return userRepository.existsByUsernameOrEmail(keyword, keyword);
+    }
+}
diff --git a/src/main/java/com/attendenceSystem/module/user/service/impl/UserServiceImpl.java b/src/main/java/com/attendenceSystem/module/user/service/impl/UserServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..12b9fbe17edc21f575a159126d96d97c623c0c32
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/module/user/service/impl/UserServiceImpl.java
@@ -0,0 +1,43 @@
+package com.attendenceSystem.module.user.service.impl;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.mapper.response.UserResponseMapper;
+import com.attendenceSystem.module.user.repository.UserRepository;
+import com.attendenceSystem.module.user.service.UserService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class UserServiceImpl implements UserService {
+    private final UserRepository userRepository;
+    private final UserResponseMapper userResponseMapper;
+
+    @Override
+    public UserResponse getById(Long id) {
+        return userResponseMapper.fromEntity(findById(id));
+    }
+
+    @Transactional
+    @Override
+    public void deleteUser(Long id) {
+        userRepository.delete(findById(id));
+    }
+
+    private User findById(Long id) {
+        return userRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng với id: " + id));
+    }
+
+    @Override
+    public Page<UserResponse> getAccounts(Pageable pageable) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getAccounts'");
+    }
+}
diff --git a/src/main/java/com/attendenceSystem/security/ActiveUserFilter.java b/src/main/java/com/attendenceSystem/security/ActiveUserFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ebc9a32781d68aaf5d4dff9ee1593eaeaec8645
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/security/ActiveUserFilter.java
@@ -0,0 +1,67 @@
+// package com.attendenceSystem.security;
+
+// import java.io.IOException;
+
+// import org.springframework.security.authentication.AnonymousAuthenticationToken;
+// import org.springframework.security.core.Authentication;
+// import org.springframework.security.core.context.SecurityContextHolder;
+// import org.springframework.stereotype.Component;
+// import org.springframework.web.filter.OncePerRequestFilter;
+
+// import com.attendenceSystem.constant.Routes;
+// import com.attendenceSystem.entity.User;
+// import com.attendenceSystem.repository.UserRepository;
+
+// import jakarta.servlet.FilterChain;
+// import jakarta.servlet.ServletException;
+// import jakarta.servlet.http.HttpServletRequest;
+// import jakarta.servlet.http.HttpServletResponse;
+// import jakarta.servlet.http.HttpSession;
+// import lombok.RequiredArgsConstructor;
+
+// @Component
+// @RequiredArgsConstructor
+// public class ActiveUserFilter extends OncePerRequestFilter {
+
+//     private final UserRepository userRepository;
+
+//     @Override
+//     protected void doFilterInternal(
+//             HttpServletRequest request,
+//             HttpServletResponse response,
+//             FilterChain filterChain)
+//             throws ServletException, IOException {
+
+//         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+//         if (authentication != null
+//                 && authentication.isAuthenticated()
+//                 && !(authentication instanceof AnonymousAuthenticationToken)) {
+
+//             String username = authentication.getName();
+
+//             User user = userRepository.findByUsername(username).orElse(null);
+
+//             if (user == null || !user.isActive()) {
+//                 SecurityContextHolder.clearContext();
+//                 HttpSession session = request.getSession(false);
+//                 if (session != null) {
+//                     session.invalidate();
+//                 }
+//                 response.sendRedirect(Routes.USER + "/login");
+//                 return;
+//             }
+//         }
+
+//         filterChain.doFilter(request, response);
+//     }
+
+//     @Override
+//     protected boolean shouldNotFilter(HttpServletRequest request) {
+//         String uri = request.getRequestURI();
+
+//         return uri.startsWith("/css/")
+//                 || uri.startsWith("/js/")
+//                 || uri.startsWith("/images/");
+//     }
+// }
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/security/ForceChangePasswordInterceptor.java b/src/main/java/com/attendenceSystem/security/ForceChangePasswordInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..3162ca01a03ba14a8713e31835410af9a2e8eadc
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/security/ForceChangePasswordInterceptor.java
@@ -0,0 +1,41 @@
+// package com.attendenceSystem.security;
+
+// import org.springframework.stereotype.Component;
+// import org.springframework.web.servlet.HandlerInterceptor;
+
+// import com.attendenceSystem.constant.Routes;
+// import com.attendenceSystem.entity.User;
+// import com.attendenceSystem.repository.UserRepository;
+// import com.attendenceSystem.util.SecurityUtil;
+
+// import jakarta.servlet.http.HttpServletRequest;
+// import jakarta.servlet.http.HttpServletResponse;
+// import lombok.RequiredArgsConstructor;
+
+// @Component
+// @RequiredArgsConstructor
+// public class ForceChangePasswordInterceptor implements HandlerInterceptor {
+//         private final UserRepository userRepository;
+        
+//         @Override
+//         public boolean preHandle(
+//                         HttpServletRequest request,
+//                         HttpServletResponse response,
+//                         Object handler)
+//                         throws Exception {
+//                 String username = SecurityUtil.getCurrentUserName();
+//                 if (username == null) {
+//                         return true;
+//                 }
+//                 User user = userRepository.findUserByUsername(username).orElse(null);
+//                 if (user == null) {
+//                         return true;
+//                 }
+//                 String uri = request.getRequestURI();
+//                 if (user.isMustChangePassword() && !uri.startsWith(Routes.USER + "/change-password")) {
+//                         response.sendRedirect(Routes.USER + "/change-password");
+//                         return false;
+//                 }
+//                 return true;
+//         }
+// }
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/security/SecurityConfig.java b/src/main/java/com/attendenceSystem/security/SecurityConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..6dc19e9ef43be56df1fcc46855348b4290a20f57
--- /dev/null
+++ b/src/main/java/com/attendenceSystem/security/SecurityConfig.java
@@ -0,0 +1,60 @@
+package com.attendenceSystem.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.core.userdetails.UserDetailsService;
+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 com.attendenceSystem.constant.Routes;
+// import com.attendenceSystem.entity.enums.Role;
+
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@EnableWebSecurity
+@RequiredArgsConstructor
+public class SecurityConfig {
+    // private final ActiveUserFilter activeUserFilter;
+    private final AuthenticationConfiguration authenticationConfiguration;
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                .authorizeHttpRequests(auth -> auth
+                        .anyRequest().permitAll())
+                .csrf(csrf -> csrf.disable());
+        return http.build();
+    }
+
+    @Bean
+    public AuthenticationManager authenticationManager() throws Exception {
+        return authenticationConfiguration.getAuthenticationManager();
+    }
+    // Chỉ dùng để test admin
+    // @Bean
+    // public UserDetailsService userDetailsService(
+    // PasswordEncoder passwordEncoder) {
+
+    // UserDetails admin = User.builder()
+    // .username("admin")
+    // .password(passwordEncoder.encode("123456"))
+    // .roles(Role.ADMIN.name())
+    // .build();
+
+    // return new InMemoryUserDetailsManager(admin);
+    // }
+}
diff --git a/src/main/java/com/attendenceSystem/user/dto/request/LoginRequest.java b/src/main/java/com/attendenceSystem/user/dto/request/LoginRequest.java
deleted file mode 100644
index 1aad262b0525e8d6c2ac5d05ee184e9d3671d3b2..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/dto/request/LoginRequest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.attendenceSystem.user.dto.request;
-
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-
-@Data
-public class LoginRequest {
-    @NotBlank(message = "Email không được để trống")
-    @Size(max = 255, message = "Email không được vượt quá 255 ký tự")
-    @Email(message = "Email không đúng định dạng")
-    private String email;
-    @NotBlank(message = "Mật khẩu không được để trống")
-    @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
-    private String password;
-
-
-}
diff --git a/src/main/java/com/attendenceSystem/user/dto/request/RegisterRequest.java b/src/main/java/com/attendenceSystem/user/dto/request/RegisterRequest.java
deleted file mode 100644
index 1a6dfdab259afd24020413e93630c07527ef1959..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/dto/request/RegisterRequest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.attendenceSystem.user.dto.request;
-
-import com.attendenceSystem.annotation.PasswordMatch;
-import com.attendenceSystem.user.entity.User;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-import lombok.NonNull;
-
-@Data
-@PasswordMatch
-public class RegisterRequest {
-    @NotBlank(message = "Email không được để trống")
-    @Size(max = 255, message = "Email không được vượt quá 255 ký tự")
-    @Email(message = "Email không đúng định dạng")
-    private String email;
-    @NotBlank(message = "Mật khẩu không được để trống")
-    @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
-    private String password;
-    @NotBlank(message = "Mật khẩu xác nhận không được để trống")
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-    private String rePassword;
-    @NotBlank(message = "Họ tên không được để trống")
-    @Size(max = 255, message = "Họ tên không được vượt quá 255 ký tự")
-    private String fullName;
-
-    @NonNull
-    public User toEntity(String hashPassword) {
-        return User.builder()
-                .email(this.email)
-                .password(hashPassword)
-                .fullName(this.fullName)
-                .build();
-    }
-}
diff --git a/src/main/java/com/attendenceSystem/user/dto/response/UserResponse.java b/src/main/java/com/attendenceSystem/user/dto/response/UserResponse.java
deleted file mode 100644
index c8e344bf64ccb12daaeb30238ad85654149872ce..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/dto/response/UserResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.attendenceSystem.user.dto.response;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class UserResponse {
-    private Long id;
-    private String email;
-    private String fullName;
-    private String avatar;
-    private String status;
-    private String createdAt;
-    private String updatedAt;
-    private Boolean deleted;
-}
diff --git a/src/main/java/com/attendenceSystem/user/entity/User.java b/src/main/java/com/attendenceSystem/user/entity/User.java
deleted file mode 100644
index f05aa98da3b0e66beb87f3ae2e2148e3b67989f4..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/entity/User.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.attendenceSystem.user.entity;
-
-import java.time.Instant;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Entity
-@Table(name = "users")
-public class User {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "email")
-    private String email;
-    @Column(name = "password")
-    private String password;
-    @Column(name = "full_name")
-    private String fullName;
-    @Column(name = "avatar")
-    private String avatar;
-    @Column(name = "role")
-    private String role;
-    @Column(name = "status")
-    private String status;
-    @Column(name = "created_at")
-    private Instant createdAt;
-    @Column(name = "updated_at")
-    private Instant updatedAt;
-    @Column(name = "deleted")
-    private Boolean deleted;
-}
diff --git a/src/main/java/com/attendenceSystem/user/entity/converter/RoleConverter.java b/src/main/java/com/attendenceSystem/user/entity/converter/RoleConverter.java
deleted file mode 100644
index ce327a4e7ba2c7b3a0200b281d9c3c3acbbb78c9..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/entity/converter/RoleConverter.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// package com.attendenceSystem.user.entity.converter;
-
-// @Converter(autoApply = true)
-// public class RoleConverter implements AttributeConverter<Role, Integer> {
-
-//     @Override
-//     public Integer convertToDatabaseColumn(Role role) {
-//         return role == null ? null : role.getValue();
-//     }
-
-//     @Override
-//     public Role convertToEntityAttribute(Integer dbData) {
-//         return dbData == null ? null : Role.fromValue(dbData);
-//     }
-// }
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/user/mapper/request/LoginRequestMapper.java b/src/main/java/com/attendenceSystem/user/mapper/request/LoginRequestMapper.java
deleted file mode 100644
index 9607fe2d62f0471536b8752a9350fea1a76410ac..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/mapper/request/LoginRequestMapper.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.attendenceSystem.user.mapper.request;
-
-public class LoginRequestMapper {
-
-}
diff --git a/src/main/java/com/attendenceSystem/user/mapper/request/RegisterRequestMapper.java b/src/main/java/com/attendenceSystem/user/mapper/request/RegisterRequestMapper.java
deleted file mode 100644
index f01c998a39be64ccefd6d07006207497fa3a2d0e..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/mapper/request/RegisterRequestMapper.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.attendenceSystem.user.mapper.request;
-
-public class RegisterRequestMapper {
-
-}
diff --git a/src/main/java/com/attendenceSystem/user/mapper/response/UserResponseMapper.java b/src/main/java/com/attendenceSystem/user/mapper/response/UserResponseMapper.java
deleted file mode 100644
index bd71a690e8b3cb3b2d38714dc405b64d7eb3c3ee..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/mapper/response/UserResponseMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.attendenceSystem.user.mapper.response;
-
-import java.time.ZoneId;
-
-import org.springframework.stereotype.Component;
-
-import com.attendenceSystem.user.dto.response.UserResponse;
-import com.attendenceSystem.user.entity.User;
-import com.attendenceSystem.util.TimeUtil;
-
-import lombok.RequiredArgsConstructor;
-
-@Component
-@RequiredArgsConstructor
-public class UserResponseMapper {
-
-    private final ZoneId applicationZoneId;
-
-    public UserResponse toResponse(User user) {
-
-        return UserResponse.builder()
-                .id(user.getId())
-                .email(user.getEmail())
-                .fullName(user.getFullName())
-                .avatar(user.getAvatar())
-                .status(user.getStatus())
-                .createdAt(
-                        TimeUtil.formatInstant(
-                                user.getCreatedAt(),
-                                applicationZoneId))
-                .updatedAt(
-                        TimeUtil.formatInstant(
-                                user.getUpdatedAt(),
-                                applicationZoneId))
-                .deleted(user.getDeleted())
-                .build();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/attendenceSystem/user/repository/UserRepository.java b/src/main/java/com/attendenceSystem/user/repository/UserRepository.java
deleted file mode 100644
index 6e9ac3b97703ef373b9e01e92e1e425278b1c84b..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/repository/UserRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.attendenceSystem.user.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import com.attendenceSystem.user.entity.User;
-
-@Repository
-public interface UserRepository extends JpaRepository<User, Long> {
-
-}
diff --git a/src/main/java/com/attendenceSystem/user/service/UserService.java b/src/main/java/com/attendenceSystem/user/service/UserService.java
deleted file mode 100644
index b590eb96b81727000e44deaaca7aebdf66ac1b6b..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/service/UserService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.attendenceSystem.user.service;
-
-import com.attendenceSystem.user.dto.request.LoginRequest;
-import com.attendenceSystem.user.dto.request.RegisterRequest;
-import com.attendenceSystem.user.dto.response.UserResponse;
-
-public interface UserService {
-    UserResponse login(LoginRequest request);
-
-    void register(RegisterRequest request);
-
-    void deleteUser(Long id);
-
-    UserResponse findAccountById(Long id);
-}
diff --git a/src/main/java/com/attendenceSystem/user/service/impl/UserServiceImpl.java b/src/main/java/com/attendenceSystem/user/service/impl/UserServiceImpl.java
deleted file mode 100644
index f620c26cf7001b6b7740fc3d77a8b4510a9c2e68..0000000000000000000000000000000000000000
--- a/src/main/java/com/attendenceSystem/user/service/impl/UserServiceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.attendenceSystem.user.service.impl;
-
-import java.time.Instant;
-import java.time.ZoneId;
-
-import com.attendenceSystem.user.dto.request.LoginRequest;
-import com.attendenceSystem.user.dto.request.RegisterRequest;
-import com.attendenceSystem.user.dto.response.UserResponse;
-import com.attendenceSystem.user.entity.User;
-import com.attendenceSystem.user.repository.UserRepository;
-import com.attendenceSystem.user.service.UserService;
-import com.attendenceSystem.util.TimeUtil;
-
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public class UserServiceImpl implements UserService {
-    private final UserRepository userRepository;
-    private final ZoneId applicationZoneId;
-    // private final PasswordEncoder passwordEncoder;
-
-    @Override
-    public UserResponse login(LoginRequest request) {
-        // Tìm tài khoản thông qua email từ request, không có báo lỗi.
-
-        // Kiểm tra mật khẩu từ request có chính xác không. Sai báo lỗi
-
-        // Trả UserResponse
-        return null;
-    }
-
-    // @Transactional
-    @Override
-    public void register(RegisterRequest request) {
-        // Kiểm tra email
-
-        // encode password
-
-        // Lưu User
-    }
-
-    @Override
-    public void deleteUser(Long id) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteUser'");
-    }
-
-    @Override
-    public UserResponse findAccountById(Long id) {
-        // Kiểm tra id == null
-
-        // Tìm kiếm user thông qua id
-
-        // Trả về UserResponse.
-        return null;
-    }
-
-    private String getCurrentTime() {
-
-        return TimeUtil.formatInstant(
-                Instant.now(),
-                applicationZoneId);
-    }
-
-}
diff --git a/src/main/java/com/attendenceSystem/validator/PasswordMatchValidator.java b/src/main/java/com/attendenceSystem/validator/PasswordMatchValidator.java
index 4832a5ad70dfbba24439f323fb7584d342c7becf..6c04b1f3b457eb7c568eedb7c628f911580aa39a 100644
--- a/src/main/java/com/attendenceSystem/validator/PasswordMatchValidator.java
+++ b/src/main/java/com/attendenceSystem/validator/PasswordMatchValidator.java
@@ -1,7 +1,7 @@
 package com.attendenceSystem.validator;
 
 import com.attendenceSystem.annotation.PasswordMatch;
-import com.attendenceSystem.user.dto.request.RegisterRequest;
+import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
@@ -13,13 +13,13 @@ public class PasswordMatchValidator
     public boolean isValid(RegisterRequest request,
             ConstraintValidatorContext context) {
 
-        if (request.getPassword() == null
-                || request.getRePassword() == null) {
+        if (request.password() == null
+                || request.rePassword() == null) {
             return true;
         }
 
-        boolean valid = request.getPassword()
-                .equals(request.getRePassword());
+        boolean valid = request.password()
+                .equals(request.rePassword());
 
         if (!valid) {
             context.disableDefaultConstraintViolation();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 0465d99e510b704df87cc1697b6eb35b4c836f7e..eaef8c7219b0223ccc61c5363776f0d5139ef1a6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -23,14 +23,14 @@ spring.devtools.livereload.enabled=true
 server.servlet.jsp.init-parameters.development=true
 
 # DataSource Configuration for SQL Server
-# spring.datasource.url=jdbc:mariadb://localhost:3306/MOONBLIGHT
-# spring.datasource.username=root
-# spring.datasource.password=QQQewqwqa401!
-# spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-
-spring.datasource.url=jdbc:mysql://localhost:3306/game_promo_web
+spring.datasource.url=jdbc:mariadb://localhost:3306/ATTENDANCE
 spring.datasource.username=root
-spring.datasource.password=annguyenthanh2k5
+spring.datasource.password=QQQewqwqa401!
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+
+# spring.datasource.url=jdbc:mysql://localhost:3306/game_promo_web
+# spring.datasource.username=root
+# spring.datasource.password=annguyenthanh2k5
 
 
 # SMPT EMAIL
@@ -40,7 +40,18 @@ spring.datasource.password=annguyenthanh2k5
 # spring.mail.password=lzzxdgzmirxdwqdv
 
 # JPA configuration
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+
+
 
+# spring.mail.properties.mail.smtp.auth=true
+# spring.mail.properties.mail.smtp.starttls.enable=true
 
+# Catch exception
+# server.error.include-message=never
+# server.error.include-binding-errors=never
+# server.error.include-stacktrace=never
+# server.error.include-exception=false
 
->>>>>>> Stashed changes
+app.timezone=Asia/Ho_Chi_Minh
\ No newline at end of file
diff --git a/src/main/resources/templates/cms/auths/login.html b/src/main/resources/templates/cms/auth/login.html
similarity index 100%
rename from src/main/resources/templates/cms/auths/login.html
rename to src/main/resources/templates/cms/auth/login.html
diff --git a/src/main/resources/templates/cms/auths/register.html b/src/main/resources/templates/cms/auth/register.html
similarity index 100%
rename from src/main/resources/templates/cms/auths/register.html
rename to src/main/resources/templates/cms/auth/register.html
diff --git a/src/main/resources/templates/cms/auths/verify-otp.html b/src/main/resources/templates/cms/auth/verify-otp.html
similarity index 100%
rename from src/main/resources/templates/cms/auths/verify-otp.html
rename to src/main/resources/templates/cms/auth/verify-otp.html
diff --git a/src/main/resources/templates/cms/documents/document-create.html b/src/main/resources/templates/cms/document/document-create.html
similarity index 100%
rename from src/main/resources/templates/cms/documents/document-create.html
rename to src/main/resources/templates/cms/document/document-create.html
diff --git a/src/main/resources/templates/cms/documents/document-detail.html b/src/main/resources/templates/cms/document/document-detail.html
similarity index 100%
rename from src/main/resources/templates/cms/documents/document-detail.html
rename to src/main/resources/templates/cms/document/document-detail.html
diff --git a/src/main/resources/templates/cms/documents/document-list.html b/src/main/resources/templates/cms/document/document-list.html
similarity index 100%
rename from src/main/resources/templates/cms/documents/document-list.html
rename to src/main/resources/templates/cms/document/document-list.html
diff --git a/src/main/resources/templates/cms/homaPage.jsp b/src/main/resources/templates/cms/homaPage.jsp
deleted file mode 100644
index 789a6de1fcd26d45b86325ee7fb541c407c8c46d..0000000000000000000000000000000000000000
--- a/src/main/resources/templates/cms/homaPage.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Dashboard</title>
-
-    <link rel="stylesheet" th:href="@{/css/dashboard-user.css}">
-</head>
-
-<body>
-
-    <!-- Background -->
-    <div class="bg-image"></div>
-
-    <div th:replace="~{cms/layouts/header :: header}"></div>
-
-    <div class="layout">
-
-
-        <main class="section">
-
-            <div class="container-xl">
-
-                <div class="section-header">
-                    <div class="header-left">
-                        <div class="section-eyebrow">
-                            SMART ATTENDANCE
-                        </div>
-
-                        <div class="section-title">
-                            SYSTEM
-                        </div>
-
-                        <div class="section-divider"></div>
-
-                        <p class="section-subtitle">
-                            Giải pháp điểm danh Face ID thông minh cho doanh nghiệp và cơ sở giáo dục.
-                            Quản lý hiệu quả, chính xác và an toàn
-                        </p>
-
-                        <a href="" class="btn btn-primary">Bắt đầu ngay</a>
-                        <a href="" class="btn btn-secondery">
-                            Xem Demo
-                        </a>
-                    </div>
-
-                    <div class="header-right">
-                        <div class="right-box">
-                            <div class="grid grid-cols-2 gap-4">
-                                <div class="header-form">
-                                    <i data-lucide="users" class="form-icon"></i>
-                                    <div class="form-line">5000+</div>
-                                    <div class="form-text">Người dùng</div>
-                                </div>
-                                <div class="header-form">
-                                    <i data-lucide="target" class="form-icon"></i>
-                                    <div class="form-line">99.8%</div>
-                                    <div class="form-text">Độ chính xác</div>
-                                </div>
-                                <div class="header-form">
-                                    <i data-lucide="building-2" class="form-icon"></i>
-                                    <div class="form-line">50+</div>
-                                    <div class="form-text">Đơn vị</div>
-                                </div>
-                                <div class="header-form">
-                                    <i data-lucide="clock" class="form-icon"></i>
-                                    <div class="form-line">24/7</div>
-                                    <div class="form-text">Hoạt động</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Home body -->
-                <div class="section-body">
-                    <div class="body-bg">
-                        <div class="body-header">
-                            <h2 class="header-title">Tính năng nổi bật</h2>
-                            <p class="section-subtitle">Giải pháp toàn diện cho quản lý điểm danh</p>
-                        </div>
-                        <div class="body-container">
-                            <div class="container-box">
-                                <div class="container-icon">
-                                    <i data-lucide="camera" class="icon"></i>
-                                </div>
-                                <h3 class="container-title">Face Recognition</h3>
-                                <p class="container-text">Nhận diện khuôn mặt chính xác với AI, chống
-                                    điểm danh hộ</p>
-                            </div>
-                            <div class="container-box">
-                                <div class="container-icon">
-                                    <i data-lucide="bar-chart-3" class="icon"></i>
-                                </div>
-                                <h3 class="container-title">Analytics Dashboard</h3>
-                                <p class="container-text">Thống kê realtime, biểu đồ trực quan, báo cáo
-                                    chi tiết</p>
-                            </div>
-                            <div class="container-box">
-                                <div class="container-icon">
-                                    <i data-lucide="file-text" class="icon"></i>
-                                </div>
-                                <h3 class="container-title">Report Management</h3>
-                                <p class="container-text">Quản lý báo cáo công việc hằng ngày và cuối
-                                    tuần</p>
-                            </div>
-                            <div class="container-box">
-                                <div class="container-icon">
-                                    <i data-lucide="calendar" class="icon"></i>
-                                </div>
-                                <h3 class="container-title">Leave Management</h3>
-                                <p class="container-text">Xin nghỉ phép, duyệt đơn, theo dõi lịch sử
-                                    nghỉ</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </main>
-    </div>
-    <div th:replace="~{cms/layouts/footer :: footer}"></div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/cms/layouts/footer.html b/src/main/resources/templates/cms/layout/footer.html
similarity index 100%
rename from src/main/resources/templates/cms/layouts/footer.html
rename to src/main/resources/templates/cms/layout/footer.html
diff --git a/src/main/resources/templates/cms/layouts/header.html b/src/main/resources/templates/cms/layout/header.html
similarity index 100%
rename from src/main/resources/templates/cms/layouts/header.html
rename to src/main/resources/templates/cms/layout/header.html
diff --git a/src/main/resources/templates/cms/reports/report-day.html b/src/main/resources/templates/cms/report/report-day.html
similarity index 100%
rename from src/main/resources/templates/cms/reports/report-day.html
rename to src/main/resources/templates/cms/report/report-day.html
diff --git a/src/main/resources/templates/cms/reports/report-month.html b/src/main/resources/templates/cms/report/report-month.html
similarity index 100%
rename from src/main/resources/templates/cms/reports/report-month.html
rename to src/main/resources/templates/cms/report/report-month.html
diff --git a/src/main/resources/templates/cms/users/user-information.html b/src/main/resources/templates/cms/user/user-information.html
similarity index 100%
rename from src/main/resources/templates/cms/users/user-information.html
rename to src/main/resources/templates/cms/user/user-information.html
diff --git a/src/main/webapp/WEB-INF/views/attendances/homeAttendance.jsp b/src/main/webapp/WEB-INF/views/attendances/homeAttendance.jsp
deleted file mode 100644
index 13708df6a3acf8cb7975b7cf52466e8885469045..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/attendances/homeAttendance.jsp
+++ /dev/null
@@ -1,143 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-
-    <html lang="en">
-
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Home Attendance</title>
-        <link href="/css/attendance.css" rel="stylesheet">
-    </head>
-
-    <body>
-
-        <!-- =======================================================================
-                                    HEADER
-    ==========================================================================-->
-        <header class="header">
-            <div class="header-left">
-                <div class="header-logo">
-                    <a href="/home">MyApp</a>
-                </div>
-
-                <div class="header-info">
-                    <h1 class="header-title">Home Attendance 1</h1>
-                    <div class="header-time">22/22/22</div>
-                </div>
-            </div>
-
-            <div class="header-right">
-
-                <div class="header-clock" id="clock">
-                    00:00:00
-                </div>
-
-                <button class="header-btn theme-toggle" id="themeToggle">
-                    🌙
-                </button>
-
-                
-
-            </div>
-        </header>
-        <!-- =======================================================================
-                                    BODY
-    ==========================================================================-->
-        <div class="container">
-            <div class="container-attend-left history">
-                <h3 class="history-title">Lịch sử chấm công</h3>
-
-                <ul class="history-list">
-
-                    <li class="history-item">
-                        <div class="history-card">
-                            <span class="history-date">
-                                Ngày 01/01/2024
-                            </span>
-
-                            <span class="history-status status-in">
-                                Vào lúc 08:00
-                            </span>
-
-                            <span class="history-status status-out">
-                                Ra lúc 17:00
-                            </span>
-                        </div>
-                    </li>
-
-                </ul>
-            </div>
-            <div class="container-attend-main">
-
-                <div class="face-scanner scanner-card">
-
-                    <!-- <video id="camera" autoplay playsinline></video> -->
-
-                    <div class="scan-overlay">
-                        <div class="scan-frame"></div>
-                        <div class="scan-line"></div>
-                    </div>
-
-                    <div class="result-card success-result">
-                        ✓ Nhận diện thành công
-                    </div>
-
-                </div>
-
-                <div class="face-guide guide-card">
-                    <p class="guide-title">
-                        Hướng dẫn chấm công bằng nhận diện khuôn mặt:
-                    </p>
-
-                    <ol class="guide-list">
-                        <li>Đứng cách camera khoảng 50cm - 1m</li>
-                        <li>Nhìn thẳng vào camera</li>
-                        <li>Giữ khuôn mặt trong khung hình</li>
-                        <li>Hệ thống sẽ tự động nhận diện và ghi nhận</li>
-                    </ol>
-                </div>
-
-            </div>
-            <div class="container-attend-right">
-
-                <h3 class="attendance-title">
-                    Thống kê hôm nay
-                </h3>
-
-                <div class="stat-card success-card">
-                    <p class="attendance-present">
-                        Đã chấm công
-                    </p>
-                    <span class="stat-number">42</span>
-                </div>
-
-                <div class="stat-card warning-card">
-                    <p class="attendance-late">
-                        Đi muộn
-                    </p>
-                    <span class="stat-number">8</span>
-                </div>
-
-                <div class="stat-card danger-card">
-                    <p class="attendance-absent">
-                        Chưa chấm công
-                    </p>
-                    <span class="stat-number">12</span>
-                </div>
-
-                <div class="attendance-info">
-                    <p class="attendance-sum">
-                        Tổng nhân viên: 50
-                    </p>
-
-                    <p class="attendance-date">
-                        Giờ làm việc: 08:00 - 17:00
-                    </p>
-                </div>
-
-            </div>
-
-    </body>
-
-    </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/auths/forgotPass.jsp b/src/main/webapp/WEB-INF/views/auths/forgotPass.jsp
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/main/webapp/WEB-INF/views/auths/login.jsp b/src/main/webapp/WEB-INF/views/auths/login.jsp
deleted file mode 100644
index 34ff895c610229d101438d7a2d86967df33df2b6..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/auths/login.jsp
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ include file="/WEB-INF/views/layouts/header.jsp" %>
-
-<div class="min-h-screen bg-gradient-to-br from-slate-950 via-indigo-950 to-slate-950 flex items-center justify-center p-4">
-    <div class="w-full max-w-md bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-8">
-        <div class="text-center mb-8">
-            <div class="w-16 h-16 bg-gradient-to-br from-indigo-500 to-purple-600 rounded-2xl flex items-center justify-center mx-auto mb-4">
-                <i data-lucide="camera" class="w-8 h-8 text-white"></i>
-            </div>
-            <h1 class="text-3xl font-bold text-white mb-2">Đăng nhập</h1>
-            <p class="text-slate-400">Truy cập vào hệ thống quản lý điểm danh</p>
-        </div>
-
-        <form action="${pageContext.request.contextPath}/login" method="POST" class="space-y-4">
-            <div class="space-y-2">
-                <label for="email" class="block text-sm text-slate-300">Email</label>
-                <input
-                    type="email"
-                    id="email"
-                    name="email"
-                    placeholder="example@company.com"
-                    class="w-full px-4 py-3 bg-slate-800/50 border border-white/10 rounded-xl text-white placeholder:text-slate-500 focus:outline-none focus:border-indigo-500 transition"
-                    required
-                />
-            </div>
-
-            <div class="space-y-2">
-                <label for="password" class="block text-sm text-slate-300">Mật khẩu</label>
-                <div class="relative">
-                    <input
-                        type="password"
-                        id="password"
-                        name="password"
-                        placeholder="••••••••"
-                        class="w-full px-4 py-3 bg-slate-800/50 border border-white/10 rounded-xl text-white placeholder:text-slate-500 focus:outline-none focus:border-indigo-500 transition pr-10"
-                        required
-                    />
-                    <button
-                        type="button"
-                        onclick="togglePassword()"
-                        class="absolute right-3 top-1/2 -translate-y-1/2 text-slate-400 hover:text-white"
-                    >
-                        <i data-lucide="eye" id="eyeIcon" class="w-5 h-5"></i>
-                    </button>
-                </div>
-            </div>
-
-            <div class="space-y-3 pt-4">
-                <button
-                    type="submit"
-                    formaction="${pageContext.request.contextPath}/employee/dashboard"
-                    class="w-full px-4 py-3 bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-700 hover:to-purple-700 rounded-xl font-medium transition"
-                >
-                    Đăng nhập với vai trò Nhân viên
-                </button>
-                <button
-                    type="submit"
-                    formaction="${pageContext.request.contextPath}/teacher/dashboard"
-                    class="w-full px-4 py-3 bg-gradient-to-r from-purple-600 to-pink-600 hover:from-purple-700 hover:to-pink-700 rounded-xl font-medium transition"
-                >
-                    Đăng nhập với vai trò Quản lý
-                </button>
-                <button
-                    type="submit"
-                    formaction="${pageContext.request.contextPath}/admin/dashboard"
-                    class="w-full px-4 py-3 bg-gradient-to-r from-pink-600 to-orange-600 hover:from-pink-700 hover:to-orange-700 rounded-xl font-medium transition"
-                >
-                    Đăng nhập với vai trò Admin
-                </button>
-            </div>
-        </form>
-
-        <div class="text-center text-sm text-slate-400 mt-6">
-            Chưa có tài khoản?
-            <a href="${pageContext.request.contextPath}/register" class="text-indigo-400 hover:text-indigo-300 font-medium">
-                Đăng ký ngay
-            </a>
-        </div>
-    </div>
-</div>
-
-<script>
-function togglePassword() {
-    const passwordInput = document.getElementById('password');
-    const eyeIcon = document.getElementById('eyeIcon');
-    if (passwordInput.type === 'password') {
-        passwordInput.type = 'text';
-        eyeIcon.setAttribute('data-lucide', 'eye-off');
-    } else {
-        passwordInput.type = 'password';
-        eyeIcon.setAttribute('data-lucide', 'eye');
-    }
-    lucide.createIcons();
-}
-</script>
-
-<%@ include file="/WEB-INF/views/layouts/footer.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/auths/register.jsp b/src/main/webapp/WEB-INF/views/auths/register.jsp
deleted file mode 100644
index 6470f68de49fe2db6c5b0ec6b326629feec672ae..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/auths/register.jsp
+++ /dev/null
@@ -1,81 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ include file="/WEB-INF/views/layouts/header.jsp" %>
-
-<div class="min-h-screen bg-gradient-to-br from-slate-950 via-indigo-950 to-slate-950 flex items-center justify-center p-4">
-    <div class="w-full max-w-md bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-8">
-        <div class="text-center mb-8">
-            <div class="w-16 h-16 bg-gradient-to-br from-indigo-500 to-purple-600 rounded-2xl flex items-center justify-center mx-auto mb-4">
-                <i data-lucide="camera" class="w-8 h-8 text-white"></i>
-            </div>
-            <h1 class="text-3xl font-bold text-white mb-2">Đăng ký</h1>
-            <p class="text-slate-400">Tạo tài khoản mới để sử dụng hệ thống</p>
-        </div>
-
-        <form action="${pageContext.request.contextPath}/register" method="POST" class="space-y-4">
-            <div class="space-y-2">
-                <label for="fullName" class="block text-sm text-slate-300">Họ và tên</label>
-                <input
-                    type="text"
-                    id="fullName"
-                    name="fullName"
-                    placeholder="Nguyễn Văn A"
-                    class="w-full px-4 py-3 bg-slate-800/50 border border-white/10 rounded-xl text-white placeholder:text-slate-500 focus:outline-none focus:border-indigo-500 transition"
-                    required
-                />
-            </div>
-
-            <div class="space-y-2">
-                <label for="email" class="block text-sm text-slate-300">Email</label>
-                <input
-                    type="email"
-                    id="email"
-                    name="email"
-                    placeholder="example@company.com"
-                    class="w-full px-4 py-3 bg-slate-800/50 border border-white/10 rounded-xl text-white placeholder:text-slate-500 focus:outline-none focus:border-indigo-500 transition"
-                    required
-                />
-            </div>
-
-            <div class="space-y-2">
-                <label for="password" class="block text-sm text-slate-300">Mật khẩu</label>
-                <input
-                    type="password"
-                    id="password"
-                    name="password"
-                    placeholder="••••••••"
-                    class="w-full px-4 py-3 bg-slate-800/50 border border-white/10 rounded-xl text-white placeholder:text-slate-500 focus:outline-none focus:border-indigo-500 transition"
-                    required
-                />
-            </div>
-
-            <div class="space-y-2">
-                <label for="confirmPassword" class="block text-sm text-slate-300">Xác nhận mật khẩu</label>
-                <input
-                    type="password"
-                    id="confirmPassword"
-                    name="confirmPassword"
-                    placeholder="••••••••"
-                    class="w-full px-4 py-3 bg-slate-800/50 border border-white/10 rounded-xl text-white placeholder:text-slate-500 focus:outline-none focus:border-indigo-500 transition"
-                    required
-                />
-            </div>
-
-            <button
-                type="submit"
-                class="w-full px-4 py-3 bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-700 hover:to-purple-700 rounded-xl font-medium transition"
-            >
-                Đăng ký
-            </button>
-        </form>
-
-        <div class="text-center text-sm text-slate-400 mt-6">
-            Đã có tài khoản?
-            <a href="${pageContext.request.contextPath}/login" class="text-indigo-400 hover:text-indigo-300 font-medium">
-                Đăng nhập
-            </a>
-        </div>
-    </div>
-</div>
-
-<%@ include file="/WEB-INF/views/layouts/footer.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/dashBoard/employees/dashboard.jsp b/src/main/webapp/WEB-INF/views/dashBoard/employees/dashboard.jsp
deleted file mode 100644
index 0bceea177213f5be318d38bcc9aacd9d15b8b858..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/dashBoard/employees/dashboard.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<%-- Set page variables --%>
-<c:set var="pageTitle" value="Dashboard" scope="request"/>
-<c:set var="roleColor" value="from-indigo-600 to-purple-600" scope="request"/>
-<c:set var="roleLabel" value="Nhân viên" scope="request"/>
-<c:set var="userName" value="Nguyễn Văn A" scope="request"/>
-<c:set var="currentPage" value="/employee/dashboard" scope="request"/>
-
-<%-- Define menu items --%>
-<jsp:useBean id="menuItems" class="java.util.ArrayList" scope="request"/>
-<%-- In real app, this would be populated from backend --%>
-
-<%@ include file="/WEB-INF/views/layout/header.jsp" %>
-
-<div class="min-h-screen bg-slate-950 flex">
-    <%@ include file="/WEB-INF/views/layout/sidebar.jsp" %>
-
-    <div class="flex-1 flex flex-col">
-        <header class="h-16 bg-slate-900/50 backdrop-blur-xl border-b border-white/10 flex items-center justify-between px-6">
-            <h1 class="text-xl font-bold text-white">Dashboard</h1>
-            <button class="relative text-slate-400 hover:text-white">
-                <i data-lucide="bell" class="w-5 h-5"></i>
-                <span class="absolute top-0 right-0 w-2 h-2 bg-red-500 rounded-full"></span>
-            </button>
-        </header>
-
-        <main class="flex-1 overflow-auto p-6">
-            <div class="space-y-6">
-                <!-- Welcome -->
-                <div class="bg-gradient-to-br from-indigo-600/20 to-purple-600/20 backdrop-blur-xl border border-white/10 rounded-2xl p-6">
-                    <h2 class="text-2xl font-bold text-white mb-2">Xin chào, ${userName}!</h2>
-                    <p class="text-slate-300">Chúc bạn một ngày làm việc hiệu quả</p>
-                </div>
-
-                <!-- Stats Cards -->
-                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-                    <div class="bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-6">
-                        <div class="flex items-start justify-between">
-                            <div class="flex-1">
-                                <p class="text-sm text-slate-400 mb-1">Check In hôm nay</p>
-                                <p class="text-2xl font-bold text-white mb-1">08:01 AM</p>
-                                <p class="text-xs text-green-400">+2 phút sớm</p>
-                            </div>
-                            <div class="w-12 h-12 rounded-xl bg-gradient-to-br from-green-600 to-emerald-600 flex items-center justify-center">
-                                <i data-lucide="log-in" class="w-6 h-6 text-white"></i>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-6">
-                        <div class="flex items-start justify-between">
-                            <div class="flex-1">
-                                <p class="text-sm text-slate-400 mb-1">Giờ làm việc</p>
-                                <p class="text-2xl font-bold text-white mb-1">7h 23m</p>
-                            </div>
-                            <div class="w-12 h-12 rounded-xl bg-gradient-to-br from-blue-600 to-cyan-600 flex items-center justify-center">
-                                <i data-lucide="clock" class="w-6 h-6 text-white"></i>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-6">
-                        <div class="flex items-start justify-between">
-                            <div class="flex-1">
-                                <p class="text-sm text-slate-400 mb-1">Tỷ lệ chuyên cần</p>
-                                <p class="text-2xl font-bold text-white mb-1">96%</p>
-                                <p class="text-xs text-green-400">+2% so với tháng trước</p>
-                            </div>
-                            <div class="w-12 h-12 rounded-xl bg-gradient-to-br from-purple-600 to-pink-600 flex items-center justify-center">
-                                <i data-lucide="trending-up" class="w-6 h-6 text-white"></i>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-6">
-                        <div class="flex items-start justify-between">
-                            <div class="flex-1">
-                                <p class="text-sm text-slate-400 mb-1">Yêu cầu chờ duyệt</p>
-                                <p class="text-2xl font-bold text-white mb-1">2</p>
-                                <p class="text-xs text-slate-400">1 nghỉ phép, 1 báo cáo</p>
-                            </div>
-                            <div class="w-12 h-12 rounded-xl bg-gradient-to-br from-orange-600 to-red-600 flex items-center justify-center">
-                                <i data-lucide="alert-circle" class="w-6 h-6 text-white"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Timeline & Calendar -->
-                <div class="grid lg:grid-cols-3 gap-6">
-                    <div class="lg:col-span-2 bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-6">
-                        <h3 class="text-white font-bold mb-6 flex items-center gap-2">
-                            <i data-lucide="clock" class="w-5 h-5"></i>
-                            Lịch trình hôm nay
-                        </h3>
-                        <div class="space-y-4">
-                            <div class="flex items-center gap-4">
-                                <div class="w-10 h-10 rounded-full bg-green-600 flex items-center justify-center">
-                                    <i data-lucide="log-in" class="w-5 h-5 text-white"></i>
-                                </div>
-                                <div class="flex-1">
-                                    <div class="text-white font-medium">Check In</div>
-                                    <div class="text-sm text-slate-400">08:01</div>
-                                </div>
-                                <div class="text-xs bg-green-600/20 text-green-400 px-2 py-1 rounded">Hoàn thành</div>
-                            </div>
-                            <div class="flex items-center gap-4">
-                                <div class="w-10 h-10 rounded-full bg-slate-700 flex items-center justify-center">
-                                    <i data-lucide="coffee" class="w-5 h-5 text-white"></i>
-                                </div>
-                                <div class="flex-1">
-                                    <div class="text-white font-medium">Nghỉ trưa</div>
-                                    <div class="text-sm text-slate-400">12:00</div>
-                                </div>
-                            </div>
-                            <div class="flex items-center gap-4">
-                                <div class="w-10 h-10 rounded-full bg-slate-700 flex items-center justify-center">
-                                    <i data-lucide="coffee" class="w-5 h-5 text-white"></i>
-                                </div>
-                                <div class="flex-1">
-                                    <div class="text-white font-medium">Quay lại làm việc</div>
-                                    <div class="text-sm text-slate-400">13:00</div>
-                                </div>
-                            </div>
-                            <div class="flex items-center gap-4">
-                                <div class="w-10 h-10 rounded-full bg-slate-700 flex items-center justify-center">
-                                    <i data-lucide="log-out" class="w-5 h-5 text-white"></i>
-                                </div>
-                                <div class="flex-1">
-                                    <div class="text-white font-medium">Check Out</div>
-                                    <div class="text-sm text-slate-400">17:30</div>
-                                </div>
-                            </div>
-                            <button class="w-full px-4 py-3 mt-4 border border-white/20 text-white hover:bg-white/5 rounded-xl transition">
-                                <i data-lucide="log-out" class="w-5 h-5 inline mr-2"></i>
-                                Điểm danh ra ca
-                            </button>
-                        </div>
-                    </div>
-
-                    <div class="bg-slate-900/50 backdrop-blur-xl border border-white/10 rounded-2xl p-6">
-                        <h3 class="text-white font-bold mb-6 flex items-center gap-2">
-                            <i data-lucide="calendar" class="w-5 h-5"></i>
-                            Lịch làm việc
-                        </h3>
-                        <div class="space-y-4 mt-6">
-                            <div class="flex items-center gap-2 text-sm">
-                                <div class="w-3 h-3 rounded-full bg-green-500"></div>
-                                <span class="text-slate-400">Có mặt</span>
-                            </div>
-                            <div class="flex items-center gap-2 text-sm">
-                                <div class="w-3 h-3 rounded-full bg-yellow-500"></div>
-                                <span class="text-slate-400">Đi muộn</span>
-                            </div>
-                            <div class="flex items-center gap-2 text-sm">
-                                <div class="w-3 h-3 rounded-full bg-red-500"></div>
-                                <span class="text-slate-400">Vắng mặt</span>
-                            </div>
-                            <div class="flex items-center gap-2 text-sm">
-                                <div class="w-3 h-3 rounded-full bg-blue-500"></div>
-                                <span class="text-slate-400">Nghỉ phép</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </main>
-    </div>
-</div>
-
-<%@ include file="/WEB-INF/views/layouts/footer.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
deleted file mode 100644
index 66630f547f1ad5dd50a8e1cf0fbf7b620649d8cc..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ /dev/null
@@ -1,130 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ include file="/WEB-INF/views/layouts/header.jsp" %>
-
-<div class="min-h-screen bg-gradient-to-br from-slate-950 via-indigo-950 to-slate-950">
-    <!-- Navigation -->
-    <nav class="border-b border-white/10 bg-slate-950/50 backdrop-blur-xl">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="flex justify-between items-center h-16">
-                <div class="flex items-center gap-2">
-                    <div class="w-10 h-10 bg-gradient-to-br from-indigo-500 to-purple-600 rounded-xl flex items-center justify-center">
-                        <i data-lucide="camera" class="w-6 h-6 text-white"></i>
-                    </div>
-                    <span class="text-xl font-bold bg-gradient-to-r from-indigo-400 to-purple-400 bg-clip-text text-transparent">
-                        Smart Attendance
-                    </span>
-                </div>
-                <div class="flex gap-4">
-                    <a href="${pageContext.request.contextPath}/login" class="px-4 py-2 text-slate-300 hover:text-white transition">Đăng nhập</a>
-                    <a href="${pageContext.request.contextPath}/register" class="px-4 py-2 bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-700 hover:to-purple-700 rounded-lg transition">Bắt đầu ngay</a>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <!-- Hero Section -->
-    <section class="relative overflow-hidden py-20 lg:py-32">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="grid lg:grid-cols-2 gap-12 items-center">
-                <div>
-                    <h1 class="text-5xl lg:text-7xl font-bold mb-6">
-                        <span class="bg-gradient-to-r from-indigo-400 via-purple-400 to-pink-400 bg-clip-text text-transparent">
-                            SMART ATTENDANCE
-                        </span>
-                        <br />
-                        <span class="text-white">SYSTEM</span>
-                    </h1>
-                    <p class="text-xl text-slate-300 mb-8 leading-relaxed">
-                        Giải pháp điểm danh Face ID thông minh cho doanh nghiệp và cơ sở giáo dục.
-                        Quản lý hiệu quả, chính xác và an toàn.
-                    </p>
-                    <div class="flex gap-4">
-                        <a href="${pageContext.request.contextPath}/register" class="px-6 py-3 bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-700 hover:to-purple-700 rounded-lg font-medium transition">
-                            Bắt đầu ngay
-                        </a>
-                        <a href="${pageContext.request.contextPath}/login" class="px-6 py-3 border border-white/20 text-white hover:bg-white/10 rounded-lg font-medium transition">
-                            Xem Demo
-                        </a>
-                    </div>
-                </div>
-
-                <div class="relative">
-                    <div class="bg-gradient-to-br from-indigo-600/20 to-purple-600/20 backdrop-blur-xl border border-white/10 rounded-3xl p-8">
-                        <div class="grid grid-cols-2 gap-4">
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="users" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">5000+</div>
-                                <div class="text-sm text-slate-400">Người dùng</div>
-                            </div>
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="target" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">99.8%</div>
-                                <div class="text-sm text-slate-400">Độ chính xác</div>
-                            </div>
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="building-2" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">50+</div>
-                                <div class="text-sm text-slate-400">Đơn vị</div>
-                            </div>
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="clock" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">24/7</div>
-                                <div class="text-sm text-slate-400">Hoạt động</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <!-- Features Section -->
-    <section class="py-20 bg-slate-900/50">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="text-center mb-16">
-                <h2 class="text-4xl font-bold text-white mb-4">Tính năng nổi bật</h2>
-                <p class="text-xl text-slate-400">Giải pháp toàn diện cho quản lý điểm danh</p>
-            </div>
-            <div class="grid md:grid-cols-2 lg:grid-cols-4 gap-6">
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-indigo-600 to-indigo-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="camera" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Face Recognition</h3>
-                    <p class="text-slate-400 leading-relaxed">Nhận diện khuôn mặt chính xác với AI, chống điểm danh hộ</p>
-                </div>
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-purple-600 to-purple-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="bar-chart-3" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Analytics Dashboard</h3>
-                    <p class="text-slate-400 leading-relaxed">Thống kê realtime, biểu đồ trực quan, báo cáo chi tiết</p>
-                </div>
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-pink-600 to-pink-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="file-text" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Report Management</h3>
-                    <p class="text-slate-400 leading-relaxed">Quản lý báo cáo công việc hằng ngày và cuối tuần</p>
-                </div>
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-orange-600 to-orange-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="calendar" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Leave Management</h3>
-                    <p class="text-slate-400 leading-relaxed">Xin nghỉ phép, duyệt đơn, theo dõi lịch sử nghỉ</p>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <!-- Footer -->
-    <footer class="border-t border-white/10 bg-slate-950/50 backdrop-blur-xl py-12">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 text-center text-slate-400">
-            <p>&copy; 2026 Smart Attendance System. All rights reserved.</p>
-        </div>
-    </footer>
-</div>
-
-<%@ include file="/WEB-INF/views/layouts/footer.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/homet.html b/src/main/webapp/WEB-INF/views/homet.html
deleted file mode 100644
index 57ddcb4238801f70ef2dd13ae252b3cbe6517d18..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/homet.html
+++ /dev/null
@@ -1,475 +0,0 @@
-
-
-<!doctype html>
-
-<!-- <html xmlns:th="http://www.thymeleaf.org"> -->
-<html>
-<head>
-    <meta charset="UTF-8" />
-    <title>Danh sách thế giới</title>
-    <style>
-        /* =====================================================
-WORLD LIST PAGE - DARK FANTASY ADMIN
-===================================================== */
-
-        :root {
-            --blood-red: #8B0000;
-            --crimson: #C41E3A;
-            --dark-bg: #080604;
-            --dark-card: #1C1410;
-            --border-dark: #2E201A;
-            --border-mid: #4A3028;
-            --cream: #DDD0B8;
-            --parchment: #C4A882;
-            --light-grey: #C8C1BC;
-            --mid-grey: #8F7E76;
-            --gold: #C9A44C;
-        }
-
-        /* =====================================================
-PAGE
-===================================================== */
-
-        main {
-            padding: 30px;
-        }
-
-        h1 {
-            color: var(--cream);
-            margin-bottom: 25px;
-
-            font-size: 2.2rem;
-            font-family: "Cormorant Garamond", serif;
-
-            letter-spacing: .05em;
-
-        }
-
-        /* =====================================================
-ALERT
-===================================================== */
-
-        p[style*="green"] {
-            background: rgba(60, 150, 60, .15);
-            color: #8ff19d;
-            padding: 12px 16px;
-            border-left: 4px solid #4caf50;
-            margin-bottom: 15px;
-        }
-
-        p[style*="red"] {
-            background: rgba(196, 30, 58, .12);
-            color: #ff9e9e;
-            padding: 12px 16px;
-            border-left: 4px solid var(--crimson);
-            margin-bottom: 15px;
-        }
-
-        /* =====================================================
-CREATE BUTTON
-===================================================== */
-
-        a[href*="create"] {
-            display: inline-block;
-            padding: 12px 22px;
-            background: var(--blood-red);
-            border: 1px solid var(--crimson);
-            color: white;
-            text-decoration: none;
-            border-radius: 6px;
-            transition: .3s;
-        }
-
-        a[href*="create"]:hover {
-            background: var(--crimson);
-            transform: translateY(-2px);
-        }
-
-        /* =====================================================
-TABLE
-===================================================== */
-
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-top: 25px;
-            background: var(--dark-card);
-            border: 1px solid var(--border-dark);
-            overflow: hidden;
-
-        }
-
-        thead {
-            background:
-                linear-gradient(180deg,
-                    rgba(139, 0, 0, .25),
-                    rgba(139, 0, 0, .08));
-        }
-
-        th {
-            padding: 15px;
-            color: var(--parchment);
-            text-transform: uppercase;
-            letter-spacing: .08em;
-            font-size: .85rem;
-            border-bottom: 1px solid var(--border-dark);
-        }
-
-        td {
-            padding: 15px;
-            color: var(--light-grey);
-            border-bottom: 1px solid rgba(255, 255, 255, .05);
-            vertical-align: middle;
-
-        }
-
-        tbody tr {
-            transition: .25s;
-        }
-
-        tbody tr:hover {
-            background: rgba(139, 0, 0, .08);
-        }
-
-        tbody tr:last-child td {
-            border-bottom: none;
-        }
-
-        /* =====================================================
-IMAGE
-===================================================== */
-
-        td img {
-            width: 120px;
-            height: 70px;
-
-            object-fit: cover;
-
-            border: 1px solid var(--border-mid);
-
-            border-radius: 4px;
-
-        }
-
-        /* =====================================================
-STATUS
-===================================================== */
-
-        .status-active {
-            color: #86f3a2;
-            font-weight: 600;
-        }
-
-        .status-deleted {
-            color: #ff8f8f;
-            font-weight: 600;
-        }
-
-        /* =====================================================
-ACTION BUTTONS
-===================================================== */
-
-        td form {
-            display: inline-block;
-
-            margin-right: 5px;
-            margin-bottom: 5px;
-
-        }
-
-        button {
-            cursor: pointer;
-
-            padding: 8px 16px;
-
-            border: none;
-
-            border-radius: 4px;
-
-            transition: .3s;
-
-        }
-
-        /* Edit */
-
-        button[type="submit"] {
-            background: #2b211c;
-            color: var(--cream);
-            border: 1px solid var(--border-mid);
-        }
-
-        button[type="submit"]:hover {
-            border-color: var(--crimson);
-        }
-
-        /* Delete */
-
-        form[action*="delete"] button {
-            background: transparent;
-
-            border: 1px solid var(--crimson);
-
-            color: var(--crimson);
-
-        }
-
-        form[action*="delete"] button:hover {
-            background: var(--crimson);
-            color: white;
-        }
-
-        /* Restore */
-
-        form[action*="restore"] button {
-            background: var(--gold);
-
-            color: #111;
-
-        }
-
-        form[action*="restore"] button:hover {
-            filter: brightness(1.1);
-        }
-
-        /* =====================================================
-PAGINATION
-===================================================== */
-
-        div[th\:if] {
-            margin-top: 30px;
-        }
-
-        div[th\:if] a,
-        div[th\:if] span {
-            display: inline-block;
-
-            margin: 0 3px;
-
-        }
-
-        div[th\:if] a {
-            padding: 10px 15px;
-
-            background: var(--dark-card);
-
-            border: 1px solid var(--border-mid);
-
-            color: var(--cream);
-
-            text-decoration: none;
-
-            transition: .3s;
-
-        }
-
-        div[th\:if] a:hover {
-            border-color: var(--crimson);
-
-            color: var(--crimson);
-
-        }
-
-        div[th\:if] span[style] {
-            padding: 10px 15px;
-
-            background: var(--blood-red);
-
-            border: 1px solid var(--crimson);
-
-            color: white;
-
-        }
-.bg-image{
-    position:fixed;
-    inset:0;
-
-    background-image:
-        linear-gradient(
-            rgba(0,0,0,.65),
-            rgba(0,0,0,.85)
-        ),
-        url('img/back.png');
-
-    background-size:cover;
-    background-position:center;
-
-    z-index:-2;
-}
-
-.bg-image::after{
-    content:"";
-
-    position:absolute;
-    inset:0;
-
-    background:
-        radial-gradient(
-            circle at top,
-            rgba(196,30,58,.15),
-            transparent 35%
-        );
-
-    z-index:-1;
-}
-        /* =====================================================
-RESPONSIVE
-===================================================== */
-
-        @media(max-width:992px) {
-
-
-            table {
-                min-width: 900px;
-            }
-
-            main {
-                overflow-x: auto;
-            }
-
-
-        }
-
-        @media(max-width:768px) {
-
-
-            h1 {
-                font-size: 1.8rem;
-            }
-
-            td,
-            th {
-                padding: 10px;
-            }
-
-
-        }
-    </style>
-</head>
-
-<body>
-    <div class="layout">
-        <th:block th:replace="~{cms/fragments/sidebar :: sidebar}"></th:block>
-
-        <div class="content-wrapper">
-            <th:block th:replace="~{cms/fragments/header :: header}"></th:block>
-            <div class="bg-image"></div>
-            <main class="cms-page">
-
-                <div class="cms-header">
-                    <h1 class="cms-title">Danh sách thế giới</h1>
-
-                    <a th:href="@{/world/moonblight/create}" class="btn btn-primary">
-                        + Tạo thế giới mới
-                    </a>
-                </div>
-
-                <p class="alert-success" th:if="${successMessage}" th:text="${successMessage}">
-                </p>
-
-                <p class="alert-error" th:if="${errorMessage}" th:text="${errorMessage}">
-                </p>
-
-                <div class="table-wrapper">
-
-                    <table class="cms-table">
-
-                        <thead>
-                            <tr>
-                                <th>ID</th>
-                                <th>Ảnh</th>
-                                <th>Ưu tiên</th>
-                                <th>Tag</th>
-                                <th>Tiêu đề</th>
-                                <th>Trạng thái</th>
-                                <th>Hành động</th>
-                            </tr>
-                        </thead>
-
-                        <tbody>
-                            <tr th:each="world : ${worlds.content}">
-
-                                <td th:text="${world.id}"></td>
-
-                                <td>
-                                    <img th:if="${world.image != null}" th:src="${world.image}" alt="World Image"
-                                        class="table-image">
-                                </td>
-
-                                <td th:text="${world.priority}"></td>
-
-                                <td th:text="${world.tag}"></td>
-
-                                <td th:text="${world.title}"></td>
-
-                                <td>
-                                    <span class="status"
-                                        th:classappend="${world.deleted} ? 'status-deleted' : 'status-active'"
-                                        th:text="${world.deleted ? 'Đã xóa' : 'Đang hiển thị'}">
-                                    </span>
-                                </td>
-
-                                <td class="action-group">
-
-                                    <form th:action="@{/world/moonblight/{id}/edit(id=${world.id})}" method="get">
-                                        <button type="submit" class="btn btn-secondary">
-                                            Sửa
-                                        </button>
-                                    </form>
-
-                                    <form th:if="${!world.deleted}"
-                                        th:action="@{/world/moonblight/{id}/delete(id=${world.id})}" method="post">
-
-                                        <button type="submit" class="btn btn-outline-red">
-                                            Xóa
-                                        </button>
-                                    </form>
-
-                                    <form th:if="${world.deleted}"
-                                        th:action="@{/world/moonblight/{id}/restore(id=${world.id})}" method="post">
-
-                                        <button type="submit" class="btn btn-gold">
-                                            Khôi phục
-                                        </button>
-                                    </form>
-
-                                </td>
-
-                            </tr>
-                        </tbody>
-
-                    </table>
-
-                </div>
-
-                <div class="pagination" th:if="${worlds.totalPages > 1}">
-
-                    <a class="page-btn" th:if="${!worlds.first}"
-                        th:href="@{/world/moonblight/list(page=${worlds.number - 1})}">
-                        ← Trước
-                    </a>
-
-                    <!-- <span th:each="i : ${#numbers.sequence(0, worlds.totalPages - 1)}"> -->
-                    <span >
-
-                        <a class="page-number" th:if="${i != worlds.number}"
-                            th:href="@{/world/moonblight/list(page=${i})}" th:text="${i + 1}">
-                        </a>
-
-                        <span class="page-number active" th:if="${i == worlds.number}" th:text="${i + 1}">
-                        </span>
-
-                    </span>
-
-                    <a class="page-btn" th:if="${!worlds.last}"
-                        th:href="@{/world/moonblight/list(page=${worlds.number + 1})}">
-                        Sau →
-                    </a>
-
-                </div>
-
-            </main>
-        </div>
-    </div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/landing.jsp b/src/main/webapp/WEB-INF/views/landing.jsp
deleted file mode 100644
index d8cf01a4febbb1cac0344183469a8e8f9acdddd7..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/landing.jsp
+++ /dev/null
@@ -1,130 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ include file="/WEB-INF/views/layout/header.jsp" %>
-
-<div class="min-h-screen bg-gradient-to-br from-slate-950 via-indigo-950 to-slate-950">
-    <!-- Navigation -->
-    <nav class="border-b border-white/10 bg-slate-950/50 backdrop-blur-xl">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="flex justify-between items-center h-16">
-                <div class="flex items-center gap-2">
-                    <div class="w-10 h-10 bg-gradient-to-br from-indigo-500 to-purple-600 rounded-xl flex items-center justify-center">
-                        <i data-lucide="camera" class="w-6 h-6 text-white"></i>
-                    </div>
-                    <span class="text-xl font-bold bg-gradient-to-r from-indigo-400 to-purple-400 bg-clip-text text-transparent">
-                        Smart Attendance
-                    </span>
-                </div>
-                <div class="flex gap-4">
-                    <a href="${pageContext.request.contextPath}/login" class="px-4 py-2 text-slate-300 hover:text-white transition">Đăng nhập</a>
-                    <a href="${pageContext.request.contextPath}/register" class="px-4 py-2 bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-700 hover:to-purple-700 rounded-lg transition">Bắt đầu ngay</a>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <!-- Hero Section -->
-    <section class="relative overflow-hidden py-20 lg:py-32">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="grid lg:grid-cols-2 gap-12 items-center">
-                <div>
-                    <h1 class="text-5xl lg:text-7xl font-bold mb-6">
-                        <span class="bg-gradient-to-r from-indigo-400 via-purple-400 to-pink-400 bg-clip-text text-transparent">
-                            SMART ATTENDANCE
-                        </span>
-                        <br />
-                        <span class="text-white">SYSTEM</span>
-                    </h1>
-                    <p class="text-xl text-slate-300 mb-8 leading-relaxed">
-                        Giải pháp điểm danh Face ID thông minh cho doanh nghiệp và cơ sở giáo dục.
-                        Quản lý hiệu quả, chính xác và an toàn.
-                    </p>
-                    <div class="flex gap-4">
-                        <a href="${pageContext.request.contextPath}/register" class="px-6 py-3 bg-gradient-to-r from-indigo-600 to-purple-600 hover:from-indigo-700 hover:to-purple-700 rounded-lg font-medium transition">
-                            Bắt đầu ngay
-                        </a>
-                        <a href="${pageContext.request.contextPath}/login" class="px-6 py-3 border border-white/20 text-white hover:bg-white/10 rounded-lg font-medium transition">
-                            Xem Demo
-                        </a>
-                    </div>
-                </div>
-
-                <div class="relative">
-                    <div class="bg-gradient-to-br from-indigo-600/20 to-purple-600/20 backdrop-blur-xl border border-white/10 rounded-3xl p-8">
-                        <div class="grid grid-cols-2 gap-4">
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="users" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">5000+</div>
-                                <div class="text-sm text-slate-400">Người dùng</div>
-                            </div>
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="target" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">99.8%</div>
-                                <div class="text-sm text-slate-400">Độ chính xác</div>
-                            </div>
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="building-2" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">50+</div>
-                                <div class="text-sm text-slate-400">Đơn vị</div>
-                            </div>
-                            <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 rounded-2xl p-6 text-center">
-                                <i data-lucide="clock" class="w-8 h-8 mx-auto mb-3 text-indigo-400"></i>
-                                <div class="text-3xl font-bold text-white mb-1">24/7</div>
-                                <div class="text-sm text-slate-400">Hoạt động</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <!-- Features Section -->
-    <section class="py-20 bg-slate-900/50">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="text-center mb-16">
-                <h2 class="text-4xl font-bold text-white mb-4">Tính năng nổi bật</h2>
-                <p class="text-xl text-slate-400">Giải pháp toàn diện cho quản lý điểm danh</p>
-            </div>
-            <div class="grid md:grid-cols-2 lg:grid-cols-4 gap-6">
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-indigo-600 to-indigo-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="camera" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Face Recognition</h3>
-                    <p class="text-slate-400 leading-relaxed">Nhận diện khuôn mặt chính xác với AI, chống điểm danh hộ</p>
-                </div>
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-purple-600 to-purple-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="bar-chart-3" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Analytics Dashboard</h3>
-                    <p class="text-slate-400 leading-relaxed">Thống kê realtime, biểu đồ trực quan, báo cáo chi tiết</p>
-                </div>
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-pink-600 to-pink-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="file-text" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Report Management</h3>
-                    <p class="text-slate-400 leading-relaxed">Quản lý báo cáo công việc hằng ngày và cuối tuần</p>
-                </div>
-                <div class="bg-slate-900/50 backdrop-blur-sm border border-white/10 hover:border-white/20 rounded-2xl p-6 transition-all group">
-                    <div class="w-14 h-14 rounded-2xl bg-gradient-to-br from-orange-600 to-orange-800 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
-                        <i data-lucide="calendar" class="w-7 h-7 text-white"></i>
-                    </div>
-                    <h3 class="text-xl font-bold text-white mb-2">Leave Management</h3>
-                    <p class="text-slate-400 leading-relaxed">Xin nghỉ phép, duyệt đơn, theo dõi lịch sử nghỉ</p>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <!-- Footer -->
-    <footer class="border-t border-white/10 bg-slate-950/50 backdrop-blur-xl py-12">
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 text-center text-slate-400">
-            <p>&copy; 2026 Smart Attendance System. All rights reserved.</p>
-        </div>
-    </footer>
-</div>
-
-<%@ include file="/WEB-INF/views/layout/footer.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/layouts/base.jsp b/src/main/webapp/WEB-INF/views/layouts/base.jsp
deleted file mode 100644
index 198e9da810b88d58564c6ee1fa2a12d0cbcaa7cb..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/layouts/base.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<%@ include file="/WEB-INF/views/layouts/header.jsp" %>
-
-<div class="min-h-screen bg-slate-950 flex">
-    <!-- Sidebar -->
-    <%@ include file="/WEB-INF/views/layouts/sidebar.jsp" %>
-
-    <!-- Main Content -->
-    <div class="flex-1 flex flex-col">
-        <!-- Header -->
-        <header class="h-16 bg-slate-900/50 backdrop-blur-xl border-b border-white/10 flex items-center justify-between px-6">
-            <div>
-                <h1 class="text-xl font-bold text-white">${pageTitle}</h1>
-            </div>
-            <div class="flex items-center gap-4">
-                <button class="relative text-slate-400 hover:text-white">
-                    <i data-lucide="bell" class="w-5 h-5"></i>
-                    <span class="absolute top-0 right-0 w-2 h-2 bg-red-500 rounded-full"></span>
-                </button>
-            </div>
-        </header>
-
-        <!-- Page Content -->
-        <main class="flex-1 overflow-auto p-6">
-            <jsp:include page="${contentPage}" />
-        </main>
-    </div>
-</div>
-
-<%@ include file="/WEB-INF/views/layouts/footer.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/layouts/footer.jsp b/src/main/webapp/WEB-INF/views/layouts/footer.jsp
deleted file mode 100644
index 0f9296a74599bf31286737b97204dd2d96f09fbd..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/layouts/footer.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
-    <!-- Custom JavaScript -->
-    <script src="${pageContext.request.contextPath}/js/main.js"></script>
-    <script src="${pageContext.request.contextPath}/js/face-recognition.js"></script>
-    <script src="${pageContext.request.contextPath}/js/attendance.js"></script>
-
-    <!-- Initialize Lucide Icons -->
-    <script>
-        lucide.createIcons();
-    </script>
-</body>
-</html>
diff --git a/src/main/webapp/WEB-INF/views/layouts/header.jsp b/src/main/webapp/WEB-INF/views/layouts/header.jsp
deleted file mode 100644
index 290f3b41916dd3eba0009243160eebc0e62c27ef..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/layouts/header.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html lang="vi">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>${pageTitle != null ? pageTitle : 'Smart Attendance System'}</title>
-
-    <!-- Tailwind CSS -->
-    <script src="https://cdn.tailwindcss.com"></script>
-
-    <!-- Custom CSS -->
-    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/style.css">
-    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/dashboard.css">
-    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/components.css">
-
-    <!-- Lucide Icons -->
-    <script src="https://unpkg.com/lucide@latest"></script>
-
-    <!-- Chart.js for charts -->
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-    <!-- Tailwind Config -->
-    <script>
-        tailwind.config = {
-            darkMode: 'class',
-            theme: {
-                extend: {
-                    colors: {
-                        slate: {
-                            950: '#0f172a'
-                        }
-                    }
-                }
-            }
-        }
-    </script>
-</head>
-<body class="bg-slate-950 text-white">
diff --git a/src/main/webapp/WEB-INF/views/layouts/sidebar.jsp b/src/main/webapp/WEB-INF/views/layouts/sidebar.jsp
deleted file mode 100644
index 12b0510755fffa8811b4436376293bef21c71ed3..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/layouts/sidebar.jsp
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<aside class="w-64 bg-slate-900/50 backdrop-blur-xl border-r border-white/10 flex flex-col">
-    <!-- Logo -->
-    <div class="p-6 border-b border-white/10">
-        <div class="flex items-center gap-3">
-            <div class="w-10 h-10 bg-gradient-to-br ${roleColor} rounded-xl flex items-center justify-center">
-                <i data-lucide="camera" class="w-6 h-6 text-white"></i>
-            </div>
-            <div>
-                <div class="font-bold text-white">Smart Attendance</div>
-                <div class="text-xs text-slate-400">${roleLabel}</div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Menu -->
-    <nav class="flex-1 p-4 space-y-1">
-        <c:forEach items="${menuItems}" var="item">
-            <a href="${pageContext.request.contextPath}${item.path}"
-                class="flex items-center gap-3 px-4 py-3 rounded-xl transition-all ${currentPage == item.path ? 'bg-gradient-to-r ' + roleColor + ' text-white' : 'text-slate-400 hover:text-white hover:bg-white/5'}">
-                <i data-lucide="${item.icon}" class="w-5 h-5"></i>
-                <span>${item.label}</span>
-            </a>
-        </c:forEach>
-    </nav>
-
-    <!-- User Profile -->
-    <div class="p-4 border-t border-white/10">
-        <div class="flex items-center gap-3 p-3 rounded-xl bg-slate-800/50">
-            <div class="w-10 h-10 rounded-full bg-gradient-to-br ${roleColor} flex items-center justify-center text-white font-bold">
-                ${userName.substring(0, 1)}
-            </div>
-            <div class="flex-1 min-w-0">
-                <div class="text-sm font-medium text-white truncate">${userName}</div>
-                <div class="text-xs text-slate-400">${roleLabel}</div>
-            </div>
-        </div>
-        <a href="${pageContext.request.contextPath}/login"
-           class="flex items-center gap-2 w-full px-4 py-2 mt-2 text-slate-400 hover:text-white rounded-xl hover:bg-white/5 transition-all">
-            <i data-lucide="log-out" class="w-4 h-4"></i>
-            <span>Đăng xuất</span>
-        </a>
-    </div>
-</aside>
diff --git a/src/main/webapp/WEB-INF/views/webapp1/face-attendance.jsp b/src/main/webapp/WEB-INF/views/webapp1/face-attendance.jsp
deleted file mode 100644
index aed74e4fecc8dc2f1d2f51fccd594177e6327bd9..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/webapp1/face-attendance.jsp
+++ /dev/null
@@ -1,157 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html lang="vi">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Điểm Danh Face ID - Face ID Attendance</title>
-    <link rel="stylesheet" href="css/theme.css">
-    <link rel="stylesheet" href="css/components.css">
-    <style>
-        .camera-frame {
-            position: relative;
-            width: 400px;
-            height: 500px;
-            background: linear-gradient(135deg, #1e3a8a 0%, #3b82f6 100%);
-            border-radius: 20px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            overflow: hidden;
-        }
-        .face-icon {
-            font-size: 10rem;
-            opacity: 0.3;
-        }
-        .corner-marker {
-            position: absolute;
-            width: 30px;
-            height: 30px;
-            border: 3px solid #60a5fa;
-        }
-        .corner-marker.top-left { top: 20px; left: 20px; border-right: none; border-bottom: none; }
-        .corner-marker.top-right { top: 20px; right: 20px; border-left: none; border-bottom: none; }
-        .corner-marker.bottom-left { bottom: 20px; left: 20px; border-right: none; border-top: none; }
-        .corner-marker.bottom-right { bottom: 20px; right: 20px; border-left: none; border-top: none; }
-        .scan-line {
-            position: absolute;
-            width: 90%;
-            height: 2px;
-            background: linear-gradient(to right, transparent, #60a5fa, transparent);
-            animation: scan 2s linear infinite;
-        }
-        @keyframes scan {
-            0% { top: 0%; }
-            100% { top: 100%; }
-        }
-        .log-item {
-            padding: 1rem;
-            background: var(--card);
-            border: 1px solid var(--border);
-            border-radius: 0.5rem;
-            margin-bottom: 0.5rem;
-        }
-    </style>
-</head>
-<body>
-    <div class="header">
-        <div class="nav">
-            <div class="nav-brand">
-                <svg width="32" height="32" fill="none" stroke="currentColor" stroke-width="2">
-                    <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-                    <circle cx="12" cy="7" r="4"></circle>
-                </svg>
-                Điểm Danh Face ID
-            </div>
-            <div class="flex items-center gap-4">
-                <div class="clock text-right">
-                    <div class="clock-time font-bold text-xl">--:--:--</div>
-                    <div class="clock-date text-sm text-muted"></div>
-                </div>
-                <button id="theme-toggle" onclick="AttendanceSystem.toggleTheme()" class="btn btn-icon btn-outline">
-                    <svg width="20" height="20" fill="none" stroke="currentColor" stroke-width="2">
-                        <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>
-                    </svg>
-                </button>
-            </div>
-        </div>
-    </div>
-
-    <div class="container" style="padding: 2rem 1.5rem;">
-        <div class="grid grid-cols-3 gap-6">
-            <!-- Recent Logs -->
-            <div>
-                <h3 class="font-bold mb-4">Lịch sử gần đây</h3>
-                <div style="max-height: 600px; overflow-y: auto;">
-                    <div class="log-item animate-slide-up">
-                        <div class="flex items-center gap-3">
-                            <div class="badge badge-success">✓</div>
-                            <div>
-                                <div class="font-semibold">Nguyễn Văn A</div>
-                                <div class="text-xs text-muted">Check In: 07:58</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="log-item animate-slide-up">
-                        <div class="flex items-center gap-3">
-                            <div class="badge badge-warning">!</div>
-                            <div>
-                                <div class="font-semibold">Trần Thị B</div>
-                                <div class="text-xs text-muted">Check In: 08:12 (Muộn)</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="log-item animate-slide-up">
-                        <div class="flex items-center gap-3">
-                            <div class="badge badge-success">✓</div>
-                            <div>
-                                <div class="font-semibold">Lê Văn C</div>
-                                <div class="text-xs text-muted">Check In: 08:00</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Camera View -->
-            <div class="text-center">
-                <h3 class="font-bold mb-4">Quét khuôn mặt</h3>
-                <div class="camera-frame mx-auto">
-                    <div class="face-icon">👤</div>
-                    <div class="corner-marker top-left"></div>
-                    <div class="corner-marker top-right"></div>
-                    <div class="corner-marker bottom-left"></div>
-                    <div class="corner-marker bottom-right"></div>
-                    <div class="scan-line"></div>
-                </div>
-                <p class="text-muted mt-4">Vui lòng nhìn vào camera để điểm danh</p>
-                <p class="text-sm text-muted">Hệ thống đang quét...</p>
-            </div>
-
-            <!-- Stats -->
-            <div>
-                <h3 class="font-bold mb-4">Thống kê hôm nay</h3>
-                <div class="stat-card stat-card-success mb-4">
-                    <div class="text-muted text-sm mb-1">Đã điểm danh</div>
-                    <div class="text-3xl font-bold text-success">42</div>
-                </div>
-                <div class="stat-card stat-card-warning mb-4">
-                    <div class="text-muted text-sm mb-1">Đi muộn</div>
-                    <div class="text-3xl font-bold text-warning">8</div>
-                </div>
-                <div class="stat-card stat-card-destructive mb-4">
-                    <div class="text-muted text-sm mb-1">Chưa điểm danh</div>
-                    <div class="text-3xl font-bold text-destructive">12</div>
-                </div>
-                <div class="card mt-6">
-                    <div class="text-sm text-muted mb-2">Tổng nhân viên</div>
-                    <div class="text-2xl font-bold">50</div>
-                    <div class="text-xs text-muted mt-2">Tỷ lệ chuyên cần: 84%</div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="js/main.js"></script>
-</body>
-</html>
diff --git a/src/main/webapp/WEB-INF/views/webapp1/index.jsp b/src/main/webapp/WEB-INF/views/webapp1/index.jsp
deleted file mode 100644
index 0c9a326eccab9b7f8145c4bb101829888024484f..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/webapp1/index.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html lang="vi">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Hệ Thống Điểm Danh Face ID</title>
-    <link rel="stylesheet" href="css/theme.css">
-    <link rel="stylesheet" href="css/components.css">
-</head>
-<body>
-    <div class="min-h-screen flex flex-col items-center justify-center" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-        <div class="text-center" style="color: white; max-width: 600px; padding: 2rem;">
-            <h1 style="font-size: 3rem; margin-bottom: 1rem;">🎯 Hệ Thống Điểm Danh</h1>
-            <h2 style="font-size: 2rem; margin-bottom: 2rem;">Face ID Recognition</h2>
-            <p style="font-size: 1.25rem; margin-bottom: 3rem; opacity: 0.9;">
-                Hệ thống điểm danh tự động bằng nhận diện khuôn mặt, 
-                quản lý báo cáo và nghỉ phép thông minh
-            </p>
-
-            <div class="grid grid-cols-1 gap-4" style="max-width: 400px; margin: 0 auto;">
-                <a href="face-attendance.jsp" class="btn btn-lg" style="background: white; color: #667eea; font-size: 1.25rem; padding: 1rem 2rem;">
-                    <svg width="24" height="24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display: inline-block; margin-right: 0.5rem;">
-                        <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-                        <circle cx="12" cy="7" r="4"></circle>
-                    </svg>
-                    Điểm Danh Face ID
-                </a>
-
-                <a href="login.jsp" class="btn btn-lg btn-outline" style="background: rgba(255,255,255,0.2); color: white; border: 2px solid white; font-size: 1.25rem; padding: 1rem 2rem;">
-                    <svg width="24" height="24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display: inline-block; margin-right: 0.5rem;">
-                        <path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"></path>
-                        <polyline points="10 17 15 12 10 7"></polyline>
-                        <line x1="15" y1="12" x2="3" y2="12"></line>
-                    </svg>
-                    Đăng Nhập Hệ Thống
-                </a>
-
-                <a href="register.jsp" class="btn btn-lg" style="background: rgba(255,255,255,0.1); color: white; border: 1px solid rgba(255,255,255,0.3); font-size: 1rem; padding: 0.75rem 1.5rem;">
-                    Đăng ký tài khoản mới →
-                </a>
-            </div>
-
-            <div class="mt-4" style="margin-top: 3rem; opacity: 0.8;">
-                <p style="font-size: 0.875rem;">© 2026 Face ID Attendance System. All rights reserved.</p>
-            </div>
-        </div>
-    </div>
-
-    <script src="js/main.js"></script>
-</body>
-</html>
diff --git a/src/main/webapp/WEB-INF/views/webapp1/login.jsp b/src/main/webapp/WEB-INF/views/webapp1/login.jsp
deleted file mode 100644
index ceeb8019617201bdb632dc084b0911b9640c8c4b..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/webapp1/login.jsp
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-    <!DOCTYPE html>
-    <html lang="vi">
-
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Đăng Nhập - Face ID Attendance</title>
-        <link rel="stylesheet" href="css/theme.css">
-        <link rel="stylesheet" href="css/components.css">
-    </head>
-
-    <body>
-        <div class="min-h-screen flex items-center justify-center"
-            style="background-color: var(--background); padding: 1.5rem;">
-            <div class="card" style="max-width: 450px; width: 100%;">
-                <div class="card-header text-center">
-                    <h1 class="card-title" style="font-size: 2rem;">Đăng Nhập</h1>
-                    <p class="card-description">Nhập thông tin để truy cập hệ thống</p>
-                </div>
-
-                <div class="card-body">
-                    <% String error=request.getParameter("error"); if (error !=null) { %>
-                        <div class="alert alert-destructive mb-4">
-                            Sai email hoặc mật khẩu!
-                        </div>
-                        <% } %>
-
-                            <form action="login" method="post" id="loginForm">
-                                <div class="form-group">
-                                    <label class="form-label">Vai trò</label>
-                                    <select name="role" class="form-control" required>
-                                        <option value="EMPLOYEE">Nhân viên (Employee)</option>
-                                        <option value="TEACHER">Giáo viên / Quản lý (Teacher)</option>
-                                        <option value="ADMIN">Quản trị viên (Admin)</option>
-                                    </select>
-                                </div>
-
-                                <div class="form-group">
-                                    <label class="form-label">Email</label>
-                                    <input type="email" name="email" class="form-control"
-                                        placeholder="your.email@company.com" required>
-                                </div>
-
-                                <div class="form-group">
-                                    <label class="form-label">Mật khẩu</label>
-                                    <div style="position: relative;">
-                                        <input type="password" name="password" id="password" class="form-control"
-                                            placeholder="••••••••" required>
-                                        <button type="button" onclick="AttendanceSystem.togglePassword('password')"
-                                            style="position: absolute; right: 10px; top: 50%; transform: translateY(-50%); background: none; border: none; cursor: pointer;">
-                                            <svg width="20" height="20" fill="none" stroke="currentColor"
-                                                stroke-width="2">
-                                                <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"></path>
-                                                <circle cx="12" cy="12" r="3"></circle>
-                                            </svg>
-                                        </button>
-                                    </div>
-                                </div>
-
-                                <button type="submit" class="btn btn-primary w-full"
-                                    style="width: 100%; margin-top: 1.5rem;">
-                                    <svg width="20" height="20" fill="none" stroke="currentColor" stroke-width="2"
-                                        stroke-linecap="round" stroke-linejoin="round">
-                                        <path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"></path>
-                                        <polyline points="10 17 15 12 10 7"></polyline>
-                                        <line x1="15" y1="12" x2="3" y2="12"></line>
-                                    </svg>
-                                    Đăng nhập
-                                </button>
-                            </form>
-                </div>
-
-                <div class="card-footer text-center">
-                    <p class="text-sm text-muted">
-                        Chưa có tài khoản?
-                        <a href="register.jsp" class="text-primary font-semibold">Đăng ký ngay</a>
-                    </p>
-                    <p class="text-sm text-muted" style="margin-top: 0.5rem;">
-                        <a href="index.jsp" class="text-muted">← Về trang chủ</a>
-                    </p>
-                </div>
-
-                <div style="text-align: center; margin-top: 1rem;">
-                    <button id="theme-toggle" onclick="AttendanceSystem.toggleTheme()" class="btn btn-icon btn-outline">
-                        <svg width="20" height="20" fill="none" stroke="currentColor" stroke-width="2"
-                            stroke-linecap="round" stroke-linejoin="round">
-                            <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>
-                        </svg>
-                    </button>
-                </div>
-            </div>
-        </div>
-
-        <script src="js/main.js"></script>
-    </body>
-
-    </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/webapp1/register.jsp b/src/main/webapp/WEB-INF/views/webapp1/register.jsp
deleted file mode 100644
index d6ebc2128d79818b3f30ddef9098f52cc04763ac..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/webapp1/register.jsp
+++ /dev/null
@@ -1,87 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html lang="vi">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Đăng Ký - Face ID Attendance</title>
-    <link rel="stylesheet" href="css/theme.css">
-    <link rel="stylesheet" href="css/components.css">
-</head>
-<body>
-    <div class="min-h-screen flex items-center justify-center" style="background-color: var(--background); padding: 1.5rem;">
-        <div class="card" style="max-width: 500px; width: 100%;">
-            <div class="card-header text-center">
-                <h1 class="card-title" style="font-size: 2rem;">Đăng Ký Tài Khoản</h1>
-                <p class="card-description">Tạo tài khoản mới để sử dụng hệ thống</p>
-            </div>
-
-            <div class="card-body">
-                <form action="register" method="post" id="registerForm">
-                    <div class="form-group">
-                        <label class="form-label">Họ và tên *</label>
-                        <input type="text" name="name" class="form-control" placeholder="Nguyễn Văn A" required>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="form-label">Email *</label>
-                        <input type="email" name="email" class="form-control" placeholder="your.email@company.com" required>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="form-label">Số điện thoại *</label>
-                        <input type="tel" name="phone" class="form-control" placeholder="0901234567" required>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="form-label">Phòng ban *</label>
-                        <select name="department" class="form-control" required>
-                            <option value="">Chọn phòng ban</option>
-                            <option value="IT">IT</option>
-                            <option value="HR">HR</option>
-                            <option value="Marketing">Marketing</option>
-                            <option value="Finance">Finance</option>
-                        </select>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="form-label">Mật khẩu *</label>
-                        <input type="password" name="password" id="password" class="form-control" placeholder="••••••••" required>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="form-label">Xác nhận mật khẩu *</label>
-                        <input type="password" name="confirmPassword" class="form-control" placeholder="••••••••" required>
-                    </div>
-
-                    <div class="alert alert-info" style="font-size: 0.875rem; margin-top: 1rem;">
-                        <strong>Lưu ý:</strong> Tài khoản của bạn sẽ cần được Admin phê duyệt trước khi có thể đăng nhập.
-                    </div>
-
-                    <button type="submit" class="btn btn-primary w-full" style="width: 100%; margin-top: 1.5rem;">
-                        <svg width="20" height="20" fill="none" stroke="currentColor" stroke-width="2">
-                            <path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path>
-                            <circle cx="8.5" cy="7" r="4"></circle>
-                            <line x1="20" y1="8" x2="20" y2="14"></line>
-                            <line x1="23" y1="11" x2="17" y2="11"></line>
-                        </svg>
-                        Đăng ký
-                    </button>
-                </form>
-            </div>
-
-            <div class="card-footer text-center">
-                <p class="text-sm text-muted">
-                    Đã có tài khoản? 
-                    <a href="login.jsp" class="text-primary font-semibold">Đăng nhập</a>
-                </p>
-                <p class="text-sm text-muted" style="margin-top: 0.5rem;">
-                    <a href="index.jsp" class="text-muted">← Về trang chủ</a>
-                </p>
-            </div>
-        </div>
-    </div>
-
-    <script src="js/main.js"></script>
-</body>
-</html>