diff --git a/src/main/java/io/hardingadonis/miu/controller/admin/AdminServlet.java b/src/main/java/io/hardingadonis/miu/controller/admin/AdminServlet.java index 31f14dd5..af8dc972 100644 --- a/src/main/java/io/hardingadonis/miu/controller/admin/AdminServlet.java +++ b/src/main/java/io/hardingadonis/miu/controller/admin/AdminServlet.java @@ -1,79 +1,33 @@ - -package admin; +package io.hardingadonis.miu.controller.admin; import java.io.IOException; -import java.io.PrintWriter; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - +@WebServlet(name = "AdminServlet", urlPatterns = {"/admin"}) public class AdminServlet extends HttpServlet { - /** - * Processes requests for both HTTP GET and POST - * methods. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - try (PrintWriter out = response.getWriter()) { - /* TODO output your page here. You may use following sample code. */ - out.println(""); - out.println(""); - out.println(""); - out.println("Servlet AdminServlet"); - out.println(""); - out.println(""); - out.println("

Servlet AdminServlet at " + request.getContextPath() + "

"); - out.println(""); - out.println(""); - } - } - - // - /** - * Handles the HTTP GET method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); + request.setCharacterEncoding("UTF-8"); + response.setContentType("text/html; charset=UTF-8"); + + request.getRequestDispatcher("/view/admin/admin.jsp").forward(request, response); } - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); } - /** - * Returns a short description of the servlet. - * - * @return a String containing servlet description - */ + @Override public String getServletInfo() { return "Short description"; }// -} +} \ No newline at end of file diff --git a/src/main/java/io/hardingadonis/miu/controller/admin/ListOrderServlet.java b/src/main/java/io/hardingadonis/miu/controller/admin/ListOrderServlet.java index a6efc16d..9f5bfe43 100644 --- a/src/main/java/io/hardingadonis/miu/controller/admin/ListOrderServlet.java +++ b/src/main/java/io/hardingadonis/miu/controller/admin/ListOrderServlet.java @@ -1,5 +1,5 @@ -package admin; +package io.hardingadonis.miu.controller.admin; import java.io.IOException; import javax.servlet.ServletException; diff --git a/src/main/java/io/hardingadonis/miu/controller/admin/ListUserServlet.java b/src/main/java/io/hardingadonis/miu/controller/admin/ListUserServlet.java index bea55548..947bf192 100644 --- a/src/main/java/io/hardingadonis/miu/controller/admin/ListUserServlet.java +++ b/src/main/java/io/hardingadonis/miu/controller/admin/ListUserServlet.java @@ -1,5 +1,5 @@ -package admin; +package io.hardingadonis.miu.controller.admin; import java.io.IOException; import javax.servlet.ServletException; diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index a6319c95..34929548 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -8,10 +8,6 @@ DefaultFilter /* - - AdminServlet - admin.AdminServlet - ListUserServlet admin.ListUserServlet @@ -20,10 +16,10 @@ ListOrderServlet admin.ListOrderServlet - + AdminServlet - /admin - + io.hardingadonis.miu.controller.admin.AdminServlet + ListUserServlet /listUser @@ -32,6 +28,10 @@ ListOrderServlet /listOrder + + AdminServlet + /admin + 15 diff --git a/src/main/webapp/assets/js/admin/demo/databases-simple-demo.js b/src/main/webapp/assets/js/admin/demo/datatables-simple-demo.js similarity index 100% rename from src/main/webapp/assets/js/admin/demo/databases-simple-demo.js rename to src/main/webapp/assets/js/admin/demo/datatables-simple-demo.js diff --git a/src/main/webapp/view/admin/admin.jsp b/src/main/webapp/view/admin/admin.jsp index b7b4726f..d5892d49 100644 --- a/src/main/webapp/view/admin/admin.jsp +++ b/src/main/webapp/view/admin/admin.jsp @@ -1,13 +1,180 @@ - - -<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - + - JSP Page + + Admin Page + + + + - -

Hello World!

+ + + +
+ +
+
+
+

Dashboard

+
    +
  1. Admin Role
    2. +
+
+
+ +
+
+ face +
+
+
TỔNG KHÁCH HÀNG
+ 15 +
+
+ +
+
+ +
+
+ bookmark +
+
+
TỔNG SẢN PHẨM
+ 50 +
+
+ +
+
+ +
+
+ shopping_cart +
+
+
TỔNG ĐƠN HÀNG
+ 30 +
+
+ +
+
+
+
+
+
+ + Area Chart Example +
+
+
Updated yesterday at 11:59 PM
+
+
+
+ +
+
+
+
+
+ + Bar Chart Example +
+
+
Updated yesterday at 11:59 PM
+
+
+
+
+
+ + Pie Chart Example +
+
+
Updated yesterday at 11:59 PM
+
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/main/webapp/view/admin/list_order.jsp b/src/main/webapp/view/admin/list_order.jsp index c2c73f06..b553ec36 100644 --- a/src/main/webapp/view/admin/list_order.jsp +++ b/src/main/webapp/view/admin/list_order.jsp @@ -36,7 +36,7 @@
Core
- +
Dashboard @@ -192,7 +192,7 @@ - + diff --git a/src/main/webapp/view/admin/list_user.jsp b/src/main/webapp/view/admin/list_user.jsp index 7b3d664c..39e07c3f 100644 --- a/src/main/webapp/view/admin/list_user.jsp +++ b/src/main/webapp/view/admin/list_user.jsp @@ -36,7 +36,7 @@
Core
- +
Dashboard @@ -103,30 +103,6 @@ - - 2 - Lê Minh Vương - 2003 - Male - HoangTHQE170116@fpt.edu.vn - Quy Nhon - Active - - - - - - 3 - Nguyễn Thị Thúy - 2003 - Male - HoangTHQE170116@fpt.edu.vn - Quy Nhon - Active - - - -
@@ -180,7 +156,7 @@ - +