Merge branch 'anh-fix-admin' of https://github.com/bakaqc/flower into…

… anh-fix-admin
bakaqc · Dec 8, 2023 · 60d52a5 · 60d52a5
2 parents ae3d712 + 68f7bd1
commit 60d52a5
Show file tree

Hide file tree

Showing 54 changed files with 1,615 additions and 775 deletions.
diff --git a/src/main/java/com/bakaqc/flower/controller/AboutController.java b/src/main/java/com/bakaqc/flower/controller/AboutController.java
@@ -17,7 +17,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         List<Categories> listCAT = CategoriesDAO.getInstance().selectAll();
 
         request.setAttribute("listCAT", listCAT);
-
         request.getRequestDispatcher("/view/about.jsp").forward(request, response);
     }
 

diff --git a/src/main/java/com/bakaqc/flower/controller/AddToCartController.java b/src/main/java/com/bakaqc/flower/controller/AddToCartController.java
@@ -0,0 +1,45 @@
+package com.bakaqc.flower.controller;
+
+import java.io.*;
+import java.util.*;
+import javax.servlet.*;
+import javax.servlet.annotation.*;
+import javax.servlet.http.*;
+
+@WebServlet(name = "AddToCartController", urlPatterns = {"/addcart"})
+public class AddToCartController extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        request.setCharacterEncoding("UTF-8");
+        response.setContentType("text/html; charset=UTF-8");
+
+        int pid = Integer.parseInt(request.getParameter("id"));
+        int amount = Integer.parseInt(request.getParameter("amount"));
+
+        addItem(request, pid, amount);
+
+        response.sendRedirect("cart");
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+    }
+
+    public void addItem(HttpServletRequest request, int pid, int amount) {
+        HttpSession session = request.getSession();
+        Map<Integer, Integer> cart = (Map<Integer, Integer>) session.getAttribute("cart");
+
+        if (cart == null) {
+            return;
+        }
+
+        if (cart.containsKey(pid)) {
+            cart.put(pid, cart.get(pid) + amount);
+        } else {
+            cart.put(pid, amount);
+        }
+    }
+}
diff --git a/src/main/java/com/bakaqc/flower/controller/AdminDeleteController.java b/src/main/java/com/bakaqc/flower/controller/AdminDeleteController.java
@@ -12,7 +12,8 @@ public class AdminDeleteController extends HttpServlet {
 
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
+        request.setCharacterEncoding("UTF-8");
+        response.setContentType("text/html; charset=UTF-8");
         try (PrintWriter out = response.getWriter()) {
             String id = request.getParameter("id");
             AdminDAO adminDAO = new AdminDAO();
@@ -35,10 +36,4 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         request.setCharacterEncoding("UTF-8");
         response.setContentType("text/html; charset=UTF-8");
     }
-
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
-
 }
diff --git a/src/main/java/com/bakaqc/flower/controller/AdminListController.java b/src/main/java/com/bakaqc/flower/controller/AdminListController.java
@@ -14,7 +14,8 @@ public class AdminListController extends HttpServlet {
 
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
+        request.setCharacterEncoding("UTF-8");
+        response.setContentType("text/html; charset=UTF-8");
         try (PrintWriter out = response.getWriter()) {
             AdminDAO adminDAO = new AdminDAO();
             List<Admin> list = adminDAO.selectAll();
@@ -39,10 +40,4 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         request.setCharacterEncoding("UTF-8");
         response.setContentType("text/html; charset=UTF-8");
     }
-
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
-
 }
diff --git a/src/main/java/com/bakaqc/flower/controller/AdminLoginController.java b/src/main/java/com/bakaqc/flower/controller/AdminLoginController.java
@@ -2,7 +2,6 @@
 
 import com.bakaqc.flower.dao.AdminDAO;
 import com.bakaqc.flower.model.Admin;
-import com.bakaqc.flower.model.option.AdminRole;
 import com.bakaqc.flower.service.Hash;
 import java.io.*;
 import javax.servlet.*;
@@ -37,13 +36,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             return;
         }
 
-        String errorMsg = "Sai mật khẩu!";
-
         if (ad == null) {
-            errorMsg = "Tài khoản không tồn tại!";
+            String errorUSN = "Tài khoản không tồn tại!";
             ad = null;
+
+            request.setAttribute("errorUSN", errorUSN);
+            this.doGet(request, response);
         }
 
+        String errorMsg = "Sai mật khẩu!";
         request.setAttribute("username", username);
         request.setAttribute("errorMsg", errorMsg);
 

diff --git a/src/main/java/com/bakaqc/flower/controller/AdminProductController.java b/src/main/java/com/bakaqc/flower/controller/AdminProductController.java
@@ -5,7 +5,6 @@
 import com.bakaqc.flower.model.Categories;
 import com.bakaqc.flower.model.Product;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.List;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -32,9 +31,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        request.setCharacterEncoding("UTF-8");
-        response.setContentType("text/html; charset=UTF-8");
-
     }
 
 }
diff --git a/src/main/java/com/bakaqc/flower/controller/ChangePassController.java b/src/main/java/com/bakaqc/flower/controller/ChangePassController.java
@@ -1,9 +1,12 @@
 package com.bakaqc.flower.controller;
 
+import com.bakaqc.flower.dao.CategoriesDAO;
 import com.bakaqc.flower.dao.UserDAO;
+import com.bakaqc.flower.model.Categories;
 import com.bakaqc.flower.model.User;
 import com.bakaqc.flower.service.Hash;
 import java.io.*;
+import java.util.List;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
@@ -14,7 +17,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         request.setCharacterEncoding("UTF-8");
         response.setContentType("text/html; charset=UTF-8");
+        List<Categories> listCAT = CategoriesDAO.getInstance().selectAll();
 
+        request.setAttribute("listCAT", listCAT);
         request.getRequestDispatcher("/view/user_change_pass.jsp").forward(request, response);
     }
 
@@ -23,26 +28,44 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         request.setCharacterEncoding("UTF-8");
         response.setContentType("text/html; charset=UTF-8");
-
-        String oldPassword = Hash.hashCode(request.getParameter("oldPassword"));
-        String newPassword = Hash.hashCode(request.getParameter("newPassword"));
-        String conPassword = Hash.hashCode(request.getParameter("conPassword"));
+        String oldPass = request.getParameter("oldPassword");
+        String newPass = request.getParameter("newPassword");
+        String conPass = request.getParameter("conPassword");
+        String oldPassword = Hash.hashCode(oldPass);
+        String newPassword = Hash.hashCode(newPass);
+        String conPassword = Hash.hashCode(conPass);
 
         HttpSession session = request.getSession();
         User us = (User) session.getAttribute("user");
         if (oldPassword.equals(us.getPassword())) {
-            if (conPassword.equals(newPassword)) {
-                UserDAO.getInstance().changePass(us.getId(), newPassword);
+            if (newPass.length() < 6) {
+                String errGotPass = "Mật khẩu mới phải nhập tối thiểu 6 ký tự!";
+                request.setAttribute("errGotPass", errGotPass);
 
-//            String success = "Đổi mật khẩu thành công.";
-//            request.setAttribute("success", success);
-                response.sendRedirect("../profile");
-
+                this.doGet(request, response);
             } else {
-                String errConfPass = "Xác nhận Mật khẩu mới không đúng!";
-                request.setAttribute("errConfPass", errConfPass);
+                if (newPassword.equals(oldPassword)) {
+                    String errOldPass = "Mật khẩu mới trùng với mật khẩu cũ!";
+                    request.setAttribute("errOldPass", errOldPass);
+
+                    this.doGet(request, response);
+                } else {
+                    if (conPassword.equals(newPassword)) {
+                        UserDAO.getInstance().changePass(us.getId(), newPassword);
+
+//                String success = "Đổi mật khẩu thành công.";
+//                request.setAttribute("success", success);
+//                request.getRequestDispatcher("/view/user_profile.jsp").forward(request, response);
+                        response.sendRedirect("profile");
+
+                    } else {
+                        String errConfPass = "Xác nhận Mật khẩu mới không đúng!";
+                        request.setAttribute("errConfPass", errConfPass);
+
+                        this.doGet(request, response);
+                    }
+                }
 
-                this.doGet(request, response);
             }
         } else {
             String errPass = "Mật khẩu không đúng!";

diff --git a/src/main/java/com/bakaqc/flower/controller/CreateAccountAdminController.java b/src/main/java/com/bakaqc/flower/controller/CreateAccountAdminController.java
@@ -15,17 +15,20 @@ public class CreateAccountAdminController extends HttpServlet {
 
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
+        request.setCharacterEncoding("UTF-8");
+        response.setContentType("text/html; charset=UTF-8");
         try (PrintWriter out = response.getWriter()) {
             String username = request.getParameter("username");
             String password = request.getParameter("password");
+
             Admin admin = new Admin();
             admin.setUserName(username);
             admin.setPassword(Hash.hashCode(password));
             admin.setRole(AdminRole.create("Admin"));
             AdminDAO.getInstance().insert(admin);
             String url = request.getHeader("referer");
             response.sendRedirect(url);
+
         }
     }
 
@@ -44,6 +47,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         request.setCharacterEncoding("UTF-8");
         response.setContentType("text/html; charset=UTF-8");
     }
-
 
-}
+}
+
diff --git a/src/main/java/com/bakaqc/flower/controller/DeleteAccountController.java b/src/main/java/com/bakaqc/flower/controller/DeleteAccountController.java
@@ -1,6 +1,5 @@
 package com.bakaqc.flower.controller;
 
-
 import com.bakaqc.flower.dao.UserDAO;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -13,7 +12,8 @@ public class DeleteAccountController extends HttpServlet {
 
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
+        request.setCharacterEncoding("UTF-8");
+        response.setContentType("text/html; charset=UTF-8");
         try (PrintWriter out = response.getWriter()) {
             String id = request.getParameter("id");
             UserDAO.getInstance().delete(id);
@@ -35,10 +35,4 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         request.setCharacterEncoding("UTF-8");
         response.setContentType("text/html; charset=UTF-8");
     }
-
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
-
 }
diff --git a/src/main/java/com/bakaqc/flower/controller/DeleteProductController.java b/src/main/java/com/bakaqc/flower/controller/DeleteProductController.java
@@ -12,7 +12,8 @@ public class DeleteProductController extends HttpServlet {
 
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
+        request.setCharacterEncoding("UTF-8");
+        response.setContentType("text/html; charset=UTF-8");
         try (PrintWriter out = response.getWriter()) {
             String id = request.getParameter("id");
             ProductDAO.getInstance().delete(id);