Merge branch 'master' into phipham

# Conflicts:
#	pom.xml
#	src/main/java/com/itsol/quantrivanphong/employee/bussiness/EmployeeBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manage/leaveform/repository/EmployeeRepository.java
#	src/main/resources/application.properties
#	src/main/resources/public/js/angular.min.js

pom.xml

@@ -15,8 +15,6 @@
     <description>Quản trị văn phòng sử dụng springboot API</description>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
     </properties>
 
@@ -25,10 +23,14 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+<<<<<<< HEAD
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-starter-security</artifactId>-->
 <!--        </dependency>-->
+=======
+
+>>>>>>> master
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -39,17 +41,23 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/log4j/log4j -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
+<<<<<<< HEAD
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -60,7 +68,12 @@
 <!--            <artifactId>spring-security-test</artifactId>-->
 <!--            <scope>test</scope>-->
 <!--        </dependency>-->
+=======
+
+
+>>>>>>> master
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -68,6 +81,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
+        <finalName>Spring4MVCCRUDRestService</finalName>
     </build>
 
 </project>

src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java

@@ -2,13 +2,14 @@ package com.itsol.quantrivanphong.access.homepage.controller;
 
 import com.itsol.quantrivanphong.access.homepage.business.CatalogiBusiness;
 import com.itsol.quantrivanphong.access.homepage.business.NewsBusiness;
-import com.itsol.quantrivanphong.employee.bussiness.EmployeeBussiness;
+
+import com.itsol.quantrivanphong.business.EmployeeBusiness;
 import com.itsol.quantrivanphong.exception.ResourceNotFoundException;
+
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.News;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,7 +26,7 @@ public class NewsController {
     private CatalogiBusiness catalogiBusiness;
 
     @Autowired
-    private EmployeeBussiness employeeBusiness;
+    private EmployeeBusiness employeeBusiness;
     // get All news
     @GetMapping("/news")
     public ResponseEntity<List<News>> getAllNews(){
@@ -48,10 +49,9 @@ public class NewsController {
     @PostMapping("/news/employees/{employeeId}")
     public News createNews(@PathVariable (value = "employeeId") int employeeId,
                            @Valid @RequestBody News news) {
-        return employeeBusiness.findById(employeeId).map(employee -> {
-            news.setEmployee(employee);
-            return newsBusiness.save(news);
-        }).orElseThrow(() -> new ResourceNotFoundException("Employee" ,"employeeId",employeeId));
+        Employee employee = employeeBusiness.findById(employeeId);
+        news.setEmployee(employee);
+        return newsBusiness.save(news);
     }
 
     // Edit news by EmployeeId
@@ -59,7 +59,7 @@ public class NewsController {
     public News updateNews(@PathVariable (value = "employeeId") int employeeId,
                            @PathVariable (value = "newsId") int newsId,
                            @Valid @RequestBody News newsRequest) {
-        if(!employeeBusiness.findById(employeeId).isPresent()) {
+        if(employeeBusiness.findById(employeeId) == null) {
             throw new ResourceNotFoundException("Employee" ,"employeeId",employeeId);
         }
         if (!newsBusiness.findById(newsId).isPresent()) {

src/main/java/com/itsol/quantrivanphong/business/EmployeeBusiness.java

+package com.itsol.quantrivanphong.business;
+
+import com.itsol.quantrivanphong.model.Employee;
+import org.springframework.validation.Validator;
+
+import java.util.List;
+
+public interface EmployeeBusiness extends Validator {
+    List<Employee> findAll();
+
+    Employee findById(int id);
+
+    Employee findEmployeeByEmailAddress(String email);
+
+    Employee findEmployeeByUserName(String name);
+
+    Employee findEmployeeByUsernameAndPassword(String username, String password);
+
+    void save(Employee employee);
+
+    void deleteById(int id);
+
+    boolean confirmEmployee(Employee employee);
+}

src/main/java/com/itsol/quantrivanphong/business/impl/EmployeeBusinessImpl.java

+package com.itsol.quantrivanphong.business.impl;
+
+import com.itsol.quantrivanphong.model.Employee;
+
+import com.itsol.quantrivanphong.repository.EmployeeRepository;
+import com.itsol.quantrivanphong.business.EmployeeBusiness;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.Errors;
+
+import java.util.List;
+
+@Service
+public class EmployeeBusinessImpl implements EmployeeBusiness {
+    @Autowired
+    private EmployeeRepository employeeRepository;
+
+    @Override
+    public List<Employee> findAll() {
+        return employeeRepository.findAll();
+    }
+
+    @Override
+    public Employee findById(int id) {
+        return employeeRepository.findById(id).orElse(null);
+    }
+
+    @Override
+    public Employee findEmployeeByEmailAddress(String email) {
+        return employeeRepository.findEmployeeByEmailAddress(email);
+    }
+
+    @Override
+    public Employee findEmployeeByUserName(String name) {
+        return employeeRepository.findEmployeeByUsername(name);
+    }
+
+    @Override
+    public Employee findEmployeeByUsernameAndPassword(String username, String password) {
+        return employeeRepository.findEmployeeByUsernameAndPassword(username,password);
+    }
+
+    @Override
+    public void save(Employee employee) {
+      employeeRepository.save(employee);
+    }
+
+    @Override
+    public void deleteById( int id) {
+      employeeRepository.deleteById(id);
+    }
+
+    @Override
+    public boolean confirmEmployee(Employee employee) {
+        return true;
+    }
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return Employee.class.isAssignableFrom(clazz);
+    }
+
+    @Override
+    public void validate(Object target, Errors errors) {
+        Employee employee = (Employee) target;
+        if(employeeRepository.findEmployeeByUsername(employee.getUsername())!=null){
+            errors.rejectValue("username","username.alreadyExist");
+        }
+
+        if(employeeRepository.findEmployeeByEmailAddress(employee.getEmailAddress())!=null){
+            errors.rejectValue("email","email.alreadyExist");
+        }
+
+        if(!employee.getPassword().equals(employee.getConfirmPassword())){
+            errors.rejectValue("password","password.wrongPassword");
+        }
+
+    }
+}

src/main/java/com/itsol/quantrivanphong/controller/EmployeeController.java

+package com.itsol.quantrivanphong.controller;
+
+import com.itsol.quantrivanphong.model.Employee;
+import com.itsol.quantrivanphong.business.EmployeeBusiness;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.util.List;
+
+@RestController
+public class EmployeeController {
+    @Autowired
+    //Retrieve Employee by id
+    private EmployeeBusiness employeeBusiness;
+
+    @RequestMapping(value = "/employee/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Employee> getEmployee(@PathVariable("id") int id) {
+        System.out.println("Fetching employee with id " + id);
+        Employee employee = employeeBusiness.findById(id);
+        if (employee == null) {
+            System.out.println("Employee with id : " + id + " not found");
+            return new ResponseEntity<Employee>(HttpStatus.NOT_FOUND);
+        }
+        return new ResponseEntity<Employee>( employee ,HttpStatus.OK);
+    }
+
+    //Retrieve all employee
+    @RequestMapping(value = "/list_employee", method = RequestMethod.GET)
+    public ResponseEntity<List<Employee>> listAllEmployee() {
+        List<Employee> employees = employeeBusiness.findAll();
+        if (employees == null) {
+            return new ResponseEntity<List<Employee>>(HttpStatus.NO_CONTENT);
+        }
+        return  new ResponseEntity<List<Employee>>( employees , null ,HttpStatus.OK);
+    }
+
+    //Update a Employee
+    @RequestMapping(value = "/employee/{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Employee> updateEmployee(@PathVariable("id") int id, @RequestBody Employee employee) {
+        System.out.println("Update Employee " + id);
+        Employee currentEmployee = employeeBusiness.findById(id);
+        if (employee == null) {
+            System.out.println("Employee with id :" + id + "not found");
+            return new ResponseEntity<Employee>(HttpStatus.NOT_FOUND);
+        }
+        currentEmployee.setUsername(employee.getUsername());
+        currentEmployee.setPassword(employee.getPassword());
+        currentEmployee.setFirstName(employee.getFirstName());
+        currentEmployee.setLastName(employee.getLastName());
+        currentEmployee.setEmailAddress(employee.getEmailAddress());
+        currentEmployee.setPhoneNumber(employee.getPhoneNumber());
+        currentEmployee.setSkype(employee.getSkype());
+        currentEmployee.setFacebookProfile(employee.getFacebookProfile());
+        currentEmployee.setPosition(employee.getPosition());
+        currentEmployee.setHomeTown(employee.getHomeTown());
+        currentEmployee.setEducation(employee.getEducation());
+        currentEmployee.setSchool(employee.getSchool());
+        currentEmployee.setDepartment(employee.getDepartment());
+        currentEmployee.setGraduationYear(employee.getGraduationYear());
+        currentEmployee.setPicture(employee.getPicture());
+        employeeBusiness.save(currentEmployee);
+        return new ResponseEntity<Employee>( currentEmployee ,HttpStatus.OK);
+
+    }
+
+    //Create a Employee
+    @RequestMapping(value = "/list_employee", method = RequestMethod.POST)
+    public ResponseEntity<Void> createEmployee(@RequestBody Employee employee,
+                                               UriComponentsBuilder uriComponentsBuilder){
+        System.out.println("Create Employee "+ employee.getUsername());
+        employeeBusiness.save(employee);
+        HttpHeaders httpHeaders = new HttpHeaders();
+       httpHeaders.setLocation(uriComponentsBuilder.path("/employee/{id}").buildAndExpand(employee.getId()).toUri());
+        return new ResponseEntity<Void>( httpHeaders ,HttpStatus.CREATED);
+    }
+    //Delete a Employee
+    @RequestMapping(value = "/employee/{id}" , method = RequestMethod.DELETE)
+    public  ResponseEntity<Employee> deleteEmployee(@PathVariable("id") int id){
+        System.out.println("Fetching and deleting Employee with id :" + id );
+        Employee employee = employeeBusiness.findById(id);
+        if(employee == null) {
+            System.out.println("Unable to delete. Employee with id :" + id + "not found");
+            return new ResponseEntity<Employee>(HttpStatus.NOT_FOUND);
+
+        }
+        employeeBusiness.deleteById(id);
+        return  new ResponseEntity<Employee>(HttpStatus.NO_CONTENT);
+    }
+
+
+}

src/main/java/com/itsol/quantrivanphong/employee/bussiness/EmployeeBussiness.java

 package com.itsol.quantrivanphong.employee.bussiness;
 
-import com.itsol.quantrivanphong.manage.leaveform.repository.EmployeeRepository;
 import com.itsol.quantrivanphong.model.Employee;
+import com.itsol.quantrivanphong.repository.EmployeeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/itsol/quantrivanphong/employee/controller/UserController.java

-//package com.itsol.quantrivanphong.employee.controller;
-//
-//import com.example.easynotes.exception.ResourceNotFoundException;
-//import com.example.easynotes.login.model.User;
-//import com.example.easynotes.users.bussiness.UserBussiness;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.validation.Valid;
-//import java.util.List;
-//
-//@RestController
-//@RequestMapping("/api")
-//public class UserController {
-//
-//    @Autowired
-//    private UserBussiness userBussiness;
-//
-//    @GetMapping("/users")
-//    public List<User> getAllUser(){ return userBussiness.findAll();}
-//
-//    @GetMapping("/users/{id}")
-//    public User getUserById(@PathVariable(value = "id") Long userId){
-//        return userBussiness.findById(userId).orElseThrow(()-> new ResourceNotFoundException("News", "id", userId));
-//    }
-//
-//    @PutMapping("/users/{id}")
-//    public ResponseEntity<User> updateUser(@PathVariable(value = "id") Long userId,
-//                                           @Valid @RequestBody User userDetails) {
-//        if (!userBussiness.findById(userId).isPresent()) {
-//            throw  new ResourceNotFoundException("User", "id", userId);
-//        }
-//        return ResponseEntity.ok(userBussiness.updateUser(userId,userDetails));
-//    }
-//}

src/main/java/com/itsol/quantrivanphong/manage/leaveform/business/LeaveFormBusiness.java

 package com.itsol.quantrivanphong.manage.leaveform.business;
 
 import com.itsol.quantrivanphong.manage.leaveform.dto.LeaveFormDTO;
-import com.itsol.quantrivanphong.manage.leaveform.repository.EmployeeRepository;
 import com.itsol.quantrivanphong.manage.leaveform.repository.LeaveFormRepository;
 import com.itsol.quantrivanphong.manage.leaveform.repository.LeaveTypeRepository;
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.LeaveForm;
 import com.itsol.quantrivanphong.model.LeaveType;
+import com.itsol.quantrivanphong.repository.EmployeeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/itsol/quantrivanphong/manage/leaveform/repository/EmployeeRepository.java

-package com.itsol.quantrivanphong.manage.leaveform.repository;
-
-import com.itsol.quantrivanphong.model.Employee;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
-    Employee findEmployeeById(int id);
-}

src/main/java/com/itsol/quantrivanphong/manage/timesheet/business/TimeSheetBusiness.java

 package com.itsol.quantrivanphong.manage.timesheet.business;
 
-import com.itsol.quantrivanphong.manage.leaveform.repository.EmployeeRepository;
 import com.itsol.quantrivanphong.manage.timesheet.dto.TimeSheetDTO;
 import com.itsol.quantrivanphong.manage.timesheet.repository.EProjectRepository;
 import com.itsol.quantrivanphong.manage.timesheet.repository.TimeSheetRepository;
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.Eproject;
 import com.itsol.quantrivanphong.model.TimeSheet;
+import com.itsol.quantrivanphong.repository.EmployeeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/itsol/quantrivanphong/model/Employee.java

@@ -8,11 +8,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 
 @Entity
-@Table(name ="employee")
+@Table(name = "employee")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -29,6 +30,9 @@ public class Employee {
 
     @Column(name = "password", length = 128, nullable = false)
     private String password;
+    @Column(name = "confirm_password")
+    @Size(min = 5, max = 20)
+    private String confirmPassword;
 
     @Column(name = "first_name", length = 50)
     private String firstName;
@@ -77,7 +81,7 @@ public class Employee {
 
     @JsonIgnore
     @OneToMany(mappedBy = "employee", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    private List<News> newsList  = new ArrayList<>();
+    private List<News> newsList = new ArrayList<>();
 
     @JsonIgnore
     @OneToMany(mappedBy = "employee", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@@ -85,7 +89,7 @@ public class Employee {
 
     @JsonIgnore
     @OneToMany(mappedBy = "employee", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    private List<EmployeeRole> employeeRoleList  = new ArrayList<>();
+    private List<EmployeeRole> employeeRoleList = new ArrayList<>();
 
     @JsonIgnore
     @OneToMany(mappedBy = "employee", fetch = FetchType.LAZY, cascade = CascadeType.ALL)

src/main/java/com/itsol/quantrivanphong/report/employee/Test.java

+package com.itsol.quantrivanphong.report.employee;
+
+public class Test {
+}

src/main/java/com/itsol/quantrivanphong/repository/EmployeeRepository.java

+package com.itsol.quantrivanphong.repository;
+
+import com.itsol.quantrivanphong.model.Employee;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface EmployeeRepository  extends JpaRepository<Employee,Integer > {
+    public Employee findEmployeeByUsername(String username);
+
+    public Employee findEmployeeByEmailAddress(String emailAddress);
+
+    public Employee findEmployeeByUsernameAndPassword(String username, String password);
+
+    Employee findByEmailAddress(String emailAddress);
+
+    Employee findEmployeeById(int id);
+}

src/main/resources/application.properties

@@ -7,12 +7,23 @@ spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
 spring.datasource.username=root
 spring.datasource.password=ahihi123
 
+# ===============================
+# JPA / HIBERNATE
+# ===============================
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
 spring.jpa.properties.hibernate.default_schema=quantrivanphong
 
+#spring.jpa.properties.hibernate.default_schema=qlns_itsol
 
+## Fix Postgres JPA Error:
+## Method org.postgresql.jdbc.PgConnection.createClob() is not yet implemented.
+#spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
+
+# ===============================
+# SEND EMAIL
+# ==============================
 spring.mail.host=smtp.gmail.com
 spring.mail.port=587
 spring.mail.username=

src/main/resources/public/index.html

-<!DOCTYPE html>
+
+<!DOCTYPE HTML>
 <html>
 <head>
-    <meta charset="UTF-8">
-    <title>Quản Trị Văn Phòng</title>
-    <!-- angular -->
-    <script src="angularjs/angular.js"></script>
-    <!-- Custom fonts for this template-->
-
-    <link href="https://use.fontawesome.com/releases/v5.6.3/css/all.css"
-          rel="stylesheet" type="text/css">
-
-    <link href="admin/css/all.min.css" rel="stylesheet"
-          type="text/css">
-
-    <!-- Page level plugin CSS-->
-    <link href="admin/css/dataTables.bootstrap4.css"
-          rel="stylesheet">
-
-    <!-- Custom styles for this template-->
-    <link href="admin/css/sb-admin.css" rel="stylesheet">
+<title>Business_Blog a Blogging Category Flat Bootstrap Responsive Website Template | World :: w3layouts</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="Business_Blog Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template, 
+Smartphone Compatible web template, free webdesigns for Nokia, Samsung, LG, SonyErricsson, Motorola web design" />
+<script type="applijewelleryion/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
+<link href="css/bootstrap.css" rel='stylesheet' type='text/css' />
+<!-- Custom Theme files -->
+<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,700" rel='stylesheet' type='text/css'>
+<link href="https://fonts.googleapis.com/css?family=Open+Sans" type='text/css'>
+<link href="css/style.css" rel='stylesheet' type='text/css' />
+
+<!--Khai báo các thư viện-->
+<script src="js/jquery-3.2.1.min.js"></script>
+<script src="js/bootstrap.min.js"></script>
+<script src="js/angular.js"></script>
+<script src="js/angular-ui-router.min.js"></script>
+<!--End khai báo thư viện-->
+
+<!--Khai báo các file js-->
+<script src="js/app.js"></script>
+<!--End khai báo các file js-->
+
+<!-- khai báo các controllers -->
+	<script src="pages/employee/employeeController.js"></script>
+
+
+<!--End khai báo controllers-->
 </head>
+<body ng-app="myApp">
+	<!--start-main-->
 
+	<div class="container">
 
-<body ng-app="">
-
-<!-- header  -->
-
-<div ng-include=" 'common/admin/header.html' "></div>
-
-<!--end header  -->
-
-<div id="wrapper">
-    <!-- menu -->
-    <div ng-include=" 'common/admin/menu.html' "></div>
-    <!-- end menu -->
-
-
-    <div class="container-fluid">
-
-        <!-- Content  -->
-        <div class="card mb-3">
-
-            <div class="card-header">
-                <i class="fas fa-table"></i> Danh Sách Dự Án
-            </div>
-            <div class="card-body" ng-app="ProjectApiModule">
-                <div class="table-responsive" ng-controller="showProject">
-                    <a href="#" class="btn btn-primary btn-circle btn-sm" style="margin-bottom: 10px;"> Thêm </a>
-                    <table class="table table-bordered" id="dataTable" width="100%"
-                           cellspacing="0">
-                        <thead>
-                        <tr>
-                            <th>Tên Dự Án</th>
-                            <th>Mô tả ngắn</th>
-                            <th>Ngày bắt đầu</th>
-                            <th>Hạn giao</th>
-                            <th>Trạng Thái</th>
-                            <th>Thao Tác</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr ng-repeat="project in listProject">
-                            <td>{{ project.name }}</td>
-                            <td>{{ project.descriptions }}</td>
-                            <td>{{ project.startDate | date:"dd/MM/yyyy" }}</td>
-                            <td>{{ project.endDate | date:"dd/MM/yyyy" }}</td>
-                            <td>{{ project.statusGet }}</td>
-                            <td><a data-ng-href="#" class="btn btn-info btn-circle btn-sm">
-                                Xem </a> <a data-ng-href="#" class="btn btn-warning btn-circle btn-sm">
-                                Sửa </a> <a data-ng-href="#" class="btn btn-danger btn-circle btn-sm">Xóa</a>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-
-        <!--End Content  -->
-
-
-    </div>
-    <!-- footer  -->
-    <div ng-include=" 'common/admin/footer.html' "></div>
-</div>
-<!--end footer  -->
-<!-- Js -->
-<!-- Bootstrap core JavaScript-->
-<script src="admin/js/jquery.min.js"></script>
-<script src="admin/js/bootstrap.bundle.min.js"></script>
-
-<!-- Core plugin JavaScript-->
-<script src="admin/js/jquery.easing.min.js"></script>
-
-<!-- Page level plugin JavaScript-->
-<script src="admin/js/Chart.min.js"></script>
-<script src="admin/js/jquery.dataTables.js"></script>
-<script src="admin/js/dataTables.bootstrap4.js"></script>
+	</div>
 
-<!-- Custom scripts for all pages-->
-<script src="admin/js/sb-admin.min.js"></script>
 
-<!--angular js-->
-<script src="components/project/projectController.js"></script>
 </body>
 </html>
\ No newline at end of file

src/main/resources/public/js/app.js

+/**
+ * 
+ */
+angular.module("myApp", ["ui.router"]).config(function($stateProvider, $urlRouterProvider,$locationProvider) {
+
+	$locationProvider.hashPrefix('');
+	$urlRouterProvider.otherwise("/index"); 
+	
+	$stateProvider
+		
+	//index layout riêng
+	 .state("index", {
+	        url: "/index",
+	        views:{
+	        	"index":{
+	            	templateUrl: "pages/index/index.htm",
+					controller: "indexController"
+	            },
+	        	"banner":{
+	        		templateUrl: "pages/index/banner.htm"
+	        	}
+	        }  
+	    })
+	    
+	// State chứa layout chung cho các trang
+	.state('app', {
+        abstract: true,
+        views: {
+            'main_layout': {
+                templateUrl: 'main_layout.html',
+            }
+        }
+    })
+    
+	// Các state bên dưới kế thừa state app
+    
+    .state("tintuc", { // Khai báo một state
+    	parent: 'app',
+        url: "/tintuc", // URL hiển thị
+        views:{
+        	"content":{
+        		templateUrl: "pages/tintuc/tintuc.htm",
+                controller: "tintucController" // khai báo controller
+        	}
+        }
+    })
+
+    .state("tuyendung", {
+    	parent: 'app',
+        url: "/tuyendung",
+        views:{
+        	"content":{
+        		 templateUrl: "pages/tuyendung/tuyendung.htm",
+        	     controller: "tuyendungController" 
+        	}
+        }
+    })
+
+    // .state("lienhe", {
+    // 	parent: 'app',
+    //     url: "/lienhe",
+    //     views:{
+    //     	"content":{
+    //     		 templateUrl: "pages/lienhe/lienhe.htm",
+    //     	     controller: "lienheController"
+    //     	}
+    //     }
+    // })
+    
+     .state("gioithieu", {
+    	parent: 'app',
+        url: "/gioithieu",
+        views:{
+        	"content":{
+        		 templateUrl: "pages/gioithieu/gioithieu.htm",
+        	     controller: "gioithieuController" 
+        	}
+        }
+    })
+    
+});
\ No newline at end of file

src/main/resources/public/main_layout.html

+<!-- technology -->
+<div class="technology-1">
+	<div class="container">
+		<div class="col-md-9 technology-left">
+			<div ui-view="content">
+			  <!-- nội dung các trang -->
+			</div>
+		</div>
+		<!-- technology-right -->
+		<div class="col-md-3 technology-right-1">
+				<div class="blo-top">
+					<div class="tech-btm">
+					<img src="images/banner1.jpg" class="img-responsive" alt=""/>
+					</div>
+				</div>
+				<div class="blo-top">
+					<div class="tech-btm">
+					<h4>Sign up to our newsletter</h4>
+					<p>Pellentesque dui, non felis. Maecenas male</p>
+						<div class="name">
+							<form>
+								<input type="text" placeholder="Email" required="">
+							</form>
+						</div>
+						<div class="button">
+							<form>
+								<input type="submit" value="Subscribe">
+							</form>
+						</div>
+							<div class="clearfix"> </div>
+					</div>
+				</div>
+				<div class="blo-top1">
+					<div class="tech-btm">
+					<h4>Tin tức nổi bật </h4>
+						<div class="blog-grids">
+							<div class="blog-grid-left">
+								<a href="singlepage.html"><img src="images/6.jpg" class="img-responsive" alt=""/></a>
+							</div>
+							<div class="blog-grid-right">
+
+								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
+							</div>
+							<div class="clearfix"> </div>
+						</div>
+						<div class="blog-grids">
+							<div class="blog-grid-left">
+								<a href="singlepage.html"><img src="images/7.jpg" class="img-responsive" alt=""/></a>
+							</div>
+							<div class="blog-grid-right">
+
+								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
+							</div>
+							<div class="clearfix"> </div>
+						</div>
+						<div class="blog-grids">
+							<div class="blog-grid-left">
+								<a href="singlepage.html"><img src="images/11.jpg" class="img-responsive" alt=""/></a>
+							</div>
+							<div class="blog-grid-right">
+
+								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
+							</div>
+							<div class="clearfix"> </div>
+						</div>
+						<div class="blog-grids">
+							<div class="blog-grid-left">
+								<a href="singlepage.html"><img src="images/9.jpg" class="img-responsive" alt=""/></a>
+							</div>
+							<div class="blog-grid-right">
+
+								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
+							</div>
+							<div class="clearfix"> </div>
+						</div>
+						<div class="blog-grids">
+							<div class="blog-grid-left">
+								<a href="singlepage.html"><img src="images/10.jpg" class="img-responsive" alt=""/></a>
+							</div>
+							<div class="blog-grid-right">
+
+								<h5><a href="singlepage.html">Pellentesque dui, non felis. Maecenas male</a> </h5>
+							</div>
+							<div class="clearfix"> </div>
+						</div>
+					</div>
+				</div>
+
+		</div>
+		<div class="clearfix"></div>
+		<!-- technology-right -->
+	</div>
+</div>
+<!-- technology -->
\ No newline at end of file

src/main/resources/public/pages/employee/employee.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<div class="container">
+    <div class="row">
+        <div class="col-md-8">
+            <div>
+                <legend>Employee Details</legend>
+                <table>
+                    <tr>
+                        <td><label>User Name</label></td>
+                        <td>
+                            <input type="text"  maxlength="29" ng-model="emp.username"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>First Name</label></td>
+                        <td>
+                            <input type="text"  maxlength="29" ng-model="emp.firstName"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Last Name</label></td>
+                        <td>
+                            <input type="text"  maxlength="29" ng-model="emp.lastName"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label id="email"  for="email">Email</label> </td>
+                        <td>
+                            <input type="email" maxlength="150" ng-model="emp.emailAddress"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label>Phone</label></td>
+                        <td>
+                            <input type="text" maxlength="10" value="" ng-model="emp.phoneNumber"/>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td><label>education:</label></td>
+                        <td>
+                            <input ng-model="emp.education"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label >home town:</label></td>
+                        <td> <input type="text" ng-model="emp.homeTown"/></td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <input type="submit" name="submit" value="submit" ng-click="save();"/>
+                            <input type="submit" name="clear" value="clear" ng-click=" emp = null"/>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+
+            <div>
+                <table class="table">
+                    <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>User Name</th>
+                        <th>First Name</th>
+                        <th>Last Name</th>
+                        <th>EmailAddress</th>
+                        <th>Phone</th>
+                        <th>Education</th>
+                        <th>Home Town</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr class="vide" ng-repeat="emp in employess">
+                        <td>{{$index + 1}}</td>
+                        <td>{{emp.username}}</td>
+                        <td>{{emp.firstName}}</td>
+                        <td>{{emp.lastName}}</td>
+                        <td>{{emp.emailAddress}}</td>
+                        <td>{{emp.phoneNumber}}</td>
+                        <td>{{emp.education}}</td>
+                        <td>{{emp.homeTown}}</td>
+
+
+
+                        <td><a href="#" ng-click="update(emp);">Update</a>
+                        <td><a href="#" confirmed-click="delete(employee);" ng-confirm-click=" Do you want to delete this user?">Delete</a></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file

src/main/resources/public/pages/employee/employeeController.js

+/**
+ * 
+ */
+angular.module("myApp",[]).controller("tintucController", function($scope, $http,$window) {
+	console.log("Tin tức controller");
+
+	$scope.emp=   {
+		"username": "",
+		"password": "",
+		"firstName": "",
+		"lastName": "",
+		"emailAddress": "",
+		"phoneNumber": "",
+		"homeTown": "",
+		"education": ""
+	};
+
+
+
+	$scope.save = save;
+
+	function save(){
+		console.log($scope.emp);
+		$http({
+			method : 'POST',
+			url : "http://localhost:8081/list_employee/",
+			data: $scope.emp
+		}).then(function successCallback(response) {
+			console.log(response);
+			// $window.location.href ='http://localhost:8081/#/tintuc';
+		}, function errorCallback(response) {
+			console.log(response)
+		});
+	}
+	$scope.update = update;
+	 function update(employee){
+      $scope.employee = employee;
+       list_employee();
+     }
+    $scope.deleteEmployee = function (employee) {
+		$http({
+			method : 'DELETE',
+			url : 'http://localhost:8081/deleteEmployee/' + employee.id
+		}).then(_success, _error);
+	}
+
+
+	$http({
+		method : 'GET',
+		url : "http://localhost:8081/list_employee/",
+	}).then(function successCallback(response) {
+		console.log(response)
+		$scope.employess=response.data;
+	}, function errorCallback(response) {
+		console.log(response)
+	});
+});
\ No newline at end of file