diff --git a/App/ImageChecker.java b/App/ImageChecker.java
deleted file mode 100644
index be4778d..0000000
--- a/App/ImageChecker.java
+++ /dev/null
@@ -1,18 +0,0 @@
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.io.IOException;
-
-public class ImageChecker {
-    public static boolean isImageExists(String imageUrl) {
-        try {
-            URL url = new URL(imageUrl);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("HEAD");
-            int responseCode = connection.getResponseCode();
-            return (responseCode == HttpURLConnection.HTTP_OK);
-        } catch (IOException e) {
-            // Error occurred while checking the image
-            return false;
-        }
-    }
-}
diff --git a/App/StockList.java b/App/StockList.java
deleted file mode 100644
index 482cdf7..0000000
--- a/App/StockList.java
+++ /dev/null
@@ -1,106 +0,0 @@
-import java.util.*;
-public class StockList 
-{
-public static LinkedList<StockItem> stock
-        = new LinkedList<StockItem>();
-
-
-public StockList() {};
-
-
-// Adds item to end of stock list
-public void addItem(StockItem item) 
-{
-    StockList.stock.addLast(item);
-}
-
-
-// Removes item identified by productID from stock list
-public void deleteItem(String itemID) 
-{
-    ListIterator itr = stock.listIterator();
-while(itr.hasNext())
- {
-            StockItem item = (StockItem)itr.next();
-    if(item.getitemID().equals(itemID))
-    {
-                    itr.remove();
-        break;
-    }
-    }
-}
-
-
-// Updates price of existing item
-public void updateItemPrice(String itemID, double price) 
-{
-    ListIterator itr = stock.listIterator();
-    while(itr.hasNext())
-    {
-        StockItem item = (StockItem)itr.next();
-        if(item.getitemID().equals(itemID))
-        {
-            item.setprice(price);
-            break;
-        }
-    }
-
-}
-
-
-// Updates quantity of existing item
-public void updateItemQuantity(String itemID, int quantity) 
-{
-    ListIterator itr = stock.listIterator();
-    while(itr.hasNext())
-    {
-        StockItem item = (StockItem)itr.next();
-        if(item.getitemID().equals(itemID))
-        {
-            item.setquantity(quantity);
-            break;
-        }
-    }
-}
-
-
-// Updates re-order level of existing item
-public void updateReOrderLevel(String itemID, 
-int reOrderLevel) 
-{
-    ListIterator itr = stock.listIterator();
-    while(itr.hasNext())
-    {
-        StockItem item = (StockItem)itr.next();
-        if(item.getitemID().equals(itemID))
-        {
-            item.setreOrderLevel(reOrderLevel);
-            break;
-        }
-    }
-}
-
-
-@Override public String toString()
-{
-  return "" + stock;
-
-}
-
-// Returns formatted representation of the stock list
-//  public String formatStockList()
-// {…}
-
-
-// Returns formatted representation of re-order list
-// Items are on this list if quantity < reOrderLevel
-//  public String formatReOrderList()
-//  {…}
-
-ListIterator listIterator() {
-    throw new UnsupportedOperationException("Not yet implemented");
-}
-
-
-
-}
diff --git a/App/StockListInterface.java b/App/StockListInterface.java
deleted file mode 100644
index 16fa0bb..0000000
--- a/App/StockListInterface.java
+++ /dev/null
@@ -1,99 +0,0 @@
-import java.util.*;
-public class StockListInterface
-{
-private StockList stock = null;
-
-public StockListInterface(StockList stock){}
-
-public void doMenu()
-{
-    System.out.println("StockList Main Menu");
-    System.out.println("*******************");
-    System.out.println("1. Add an Item");
-    System.out.println("2. Delete an Item");
-    System.out.println("3. Update Item Price");
-    System.out.println("4. Update Item Quantity");
-    System.out.println("5. Update ReOrder Level");
-    System.out.println("6. Print Stock List");
-    System.out.println("7. Print ReOrder List");
-    System.out.println("8. Exit");
-
-    System.out.println("Select option [1-8] :>");
-}
-
-
-
-private void doAddItem(StockItem item) 
-{
-    StockList.stock.addLast(item);
-}
-
-private void doDeleteItem(String itemID)
-{
-    ListIterator itr = stock.listIterator();
-while(itr.hasNext())
- {
-            StockItem item = (StockItem)itr.next();
-    if(item.getitemID().equals(itemID))
-    {
-                    itr.remove();
-        break;
-    }
-    }
-
-
-
-
-
-private void doUpdateItemPrice(String itemID, double price)
-{
-    ListIterator itr = stock.listIterator();
-    while(itr.hasNext())
-    {
-        StockItem item = (StockItem)itr.next();
-        if(item.getitemID().equals(itemID))
-        {
-            item.setprice(price);
-            break;
-        }
-    }
-}
-
-
-
-
-
-private void doUpdateItemQuantity(String itemID, int quantity)
-{
-    ListIterator itr = stock.listIterator();
-    while(itr.hasNext())
-    {
-        StockItem item = (StockItem)itr.next();
-        if(item.getitemID().equals(itemID))
-        {
-            item.setquantity(quantity);
-            break;
-        }
-    }
-}
-
-private void doUpdateReOrderLevel(String itemID, int reOrderLevel)
-{
-    ListIterator itr = stock.listIterator();
-    while(itr.hasNext())
-    {
-        StockItem item = (StockItem)itr.next();
-        if(item.getitemID().equals(itemID))
-        {
-            item.setreOrderLevel(reOrderLevel);
-            break;
-        }
-    }
-}
-
-// Display contents of stock list
-private void doPrintStockList() {}
-
-// Display contents of re-order list
-private void doPrintReorderLIst() {}
-}
diff --git a/App/build/web/FastLoad.jsp b/App/build/web/FastLoad.jsp
deleted file mode 100644
index 65319fc..0000000
--- a/App/build/web/FastLoad.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Lazy Loading Example</title>
-    <style>
-        .lazy {
-            display: block;
-            width: 100%;
-            height: auto;
-            min-height: 200px; 
-            background-color: #f0f0f0; 
-        }
-    </style>
-</head>
-<body>
-    
-    
-    <img class="lazy" data-src="placeholder.jpg" alt="Placeholder Image">
-
-   
-    <jsp:include page="lazyLoadImages.jsp"></jsp:include>
-
-    <script>
-        
-        document.addEventListener("DOMContentLoaded", function() {
-            var lazyImg = document.querySelectorAll('img.lazy');
-            var options = {
-                rootMargin: '0px 0px 51px 0px',
-                threshold: 0.1
-            };
-            var lazyLoad = function(entries, observer) {
-                entries.forEach(function(entry) {
-                    if (entry.isIntersecting) {
-                        var lazyImg = entry.target;
-                        lazyImg.src = lazyImage.getAttribute('data-src');
-                        lazyImg.classList.remove('lazy');
-                        observer.unobserve(lazyImg);
-                    }
-                });
-            };
-
-            });
-        });
-    </script>
-</body>
-</html>
diff --git a/App/build/web/SiteParts/admin logout.jsp b/App/build/web/SiteParts/admin logout.jsp
deleted file mode 100644
index f61715e..0000000
--- a/App/build/web/SiteParts/admin logout.jsp	
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ page import="javax.servlet.http.HttpSession" %>
-<%@ page import="java.io.IOException" %>
-<%@ page import="java.io.PrintWriter" %>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Admin Logout</title>
-</head>
-<body>
-    <% 
-        HttpSession session = request.getSession(false); // Retrieve the session without creating a new one if it doesn't exist
-
-        if (session != null) {
-            session.invalidate(); // Invalidate the session, effectively logging out the admin
-            response.sendRedirect("home.jsp"); // Redirect to home page
-        } else {
-            // If session doesn't exist, display a message
-            out.println("<p>Session does not exist. You are already logged out.</p>");
-            out.println("<a href=\"adminLogin.jsp\">Back to Admin Login</a>");
-        }
-    %>
-</body>
-</html>
diff --git a/App/build/web/SiteParts/order_date.jsp b/App/build/web/SiteParts/order_date.jsp
deleted file mode 100644
index 454f256..0000000
--- a/App/build/web/SiteParts/order_date.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-
-<html>
-    <body>
-        <h1>Order Date: <%= request.getAttribute("orderDate")%></h1>
-    </body>
-</html>
-
diff --git a/App/build/web/Sorting.jsp b/App/build/web/Sorting.jsp
deleted file mode 100644
index 1fe292f..0000000
--- a/App/build/web/Sorting.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-public class ProductServlet extends HttpServlet {
-
-    private List<Product> products = Arrays.asList(
-        new Product(1, "Product A", 100),
-        new Product(2, "Product B", 200),
-        new Product(3, "Product C", 150)
-    );
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-
-        String sortParam = request.getParameter("sort");
-        String sortOrder = request.getParameter("order"); // Add parameter for sort order
-
-        // Default sort order is ascending
-        Comparator<Product> comparator = null;
-        if ("name".equals(sortParam)) {
-            comparator = Comparator.comparing(Product::getName);
-        } else if ("price".equals(sortParam)) {
-            comparator = Comparator.comparing(Product::getPrice);
-        }
-
-        // Apply descending order if specified
-        if ("desc".equals(sortOrder) && comparator != null) {
-            comparator = comparator.reversed();
-        }
-
-        // Sort the products based on the comparator
-        if (comparator != null) {
-            Collections.sort(products, comparator);
-        }
-
-        request.setAttribute("products", products);
-        RequestDispatcher dispatcher = request.getRequestDispatcher("/products.jsp");
-        dispatcher.forward(request, response);
-    }
-}
diff --git a/App/build/web/WEB-INF/classes/AddProduct.class b/App/build/web/WEB-INF/classes/AddProduct.class
index 4f7eb6b..815abe9 100644
Binary files a/App/build/web/WEB-INF/classes/AddProduct.class and b/App/build/web/WEB-INF/classes/AddProduct.class differ
diff --git a/App/build/web/WEB-INF/classes/AddToCart.class b/App/build/web/WEB-INF/classes/AddToCart.class
index 4fdbbfd..fc93641 100644
Binary files a/App/build/web/WEB-INF/classes/AddToCart.class and b/App/build/web/WEB-INF/classes/AddToCart.class differ
diff --git a/App/build/web/WEB-INF/classes/ChangeAmount.class b/App/build/web/WEB-INF/classes/ChangeAmount.class
index a99f04a..e986247 100644
Binary files a/App/build/web/WEB-INF/classes/ChangeAmount.class and b/App/build/web/WEB-INF/classes/ChangeAmount.class differ
diff --git a/App/build/web/WEB-INF/classes/ChangeOrderStatus.class b/App/build/web/WEB-INF/classes/ChangeOrderStatus.class
index fbd5c53..996af9f 100644
Binary files a/App/build/web/WEB-INF/classes/ChangeOrderStatus.class and b/App/build/web/WEB-INF/classes/ChangeOrderStatus.class differ
diff --git a/App/build/web/WEB-INF/classes/Config/Config.class b/App/build/web/WEB-INF/classes/Config/Config.class
index f109e8e..f1103c0 100644
Binary files a/App/build/web/WEB-INF/classes/Config/Config.class and b/App/build/web/WEB-INF/classes/Config/Config.class differ
diff --git a/App/build/web/WEB-INF/classes/Config/DB.class b/App/build/web/WEB-INF/classes/Config/DB.class
index 82f12b5..91584f7 100644
Binary files a/App/build/web/WEB-INF/classes/Config/DB.class and b/App/build/web/WEB-INF/classes/Config/DB.class differ
diff --git a/App/build/web/WEB-INF/classes/Config/Functions.class b/App/build/web/WEB-INF/classes/Config/Functions.class
index 847b2e1..bf6ed25 100644
Binary files a/App/build/web/WEB-INF/classes/Config/Functions.class and b/App/build/web/WEB-INF/classes/Config/Functions.class differ
diff --git a/App/build/web/WEB-INF/classes/ContactUs.class b/App/build/web/WEB-INF/classes/ContactUs.class
index a379e19..b6a68a5 100644
Binary files a/App/build/web/WEB-INF/classes/ContactUs.class and b/App/build/web/WEB-INF/classes/ContactUs.class differ
diff --git a/App/build/web/WEB-INF/classes/DatabaseConnector.class b/App/build/web/WEB-INF/classes/DatabaseConnector.class
deleted file mode 100644
index a25ed3d..0000000
Binary files a/App/build/web/WEB-INF/classes/DatabaseConnector.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/EditProduct.class b/App/build/web/WEB-INF/classes/EditProduct.class
index e9ee29a..8ca7ac8 100644
Binary files a/App/build/web/WEB-INF/classes/EditProduct.class and b/App/build/web/WEB-INF/classes/EditProduct.class differ
diff --git a/App/build/web/WEB-INF/classes/EmbeddedJettyServer.class b/App/build/web/WEB-INF/classes/EmbeddedJettyServer.class
deleted file mode 100644
index 5160881..0000000
Binary files a/App/build/web/WEB-INF/classes/EmbeddedJettyServer.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/HttpServletRequest.class b/App/build/web/WEB-INF/classes/HttpServletRequest.class
deleted file mode 100644
index e42214e..0000000
Binary files a/App/build/web/WEB-INF/classes/HttpServletRequest.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/LoginServlet.class b/App/build/web/WEB-INF/classes/LoginServlet.class
index e116843..ecf565a 100644
Binary files a/App/build/web/WEB-INF/classes/LoginServlet.class and b/App/build/web/WEB-INF/classes/LoginServlet.class differ
diff --git a/App/build/web/WEB-INF/classes/Logout.class b/App/build/web/WEB-INF/classes/Logout.class
deleted file mode 100644
index 22d77ab..0000000
Binary files a/App/build/web/WEB-INF/classes/Logout.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/LogoutServlet.class b/App/build/web/WEB-INF/classes/LogoutServlet.class
index e510fda..4da737a 100644
Binary files a/App/build/web/WEB-INF/classes/LogoutServlet.class and b/App/build/web/WEB-INF/classes/LogoutServlet.class differ
diff --git a/App/build/web/WEB-INF/classes/NewTest.class b/App/build/web/WEB-INF/classes/NewTest.class
new file mode 100644
index 0000000..8d3cdcf
Binary files /dev/null and b/App/build/web/WEB-INF/classes/NewTest.class differ
diff --git a/App/build/web/WEB-INF/classes/OrderDate.class b/App/build/web/WEB-INF/classes/OrderDate.class
deleted file mode 100644
index 712c369..0000000
Binary files a/App/build/web/WEB-INF/classes/OrderDate.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/ProfileEditServlet.class b/App/build/web/WEB-INF/classes/ProfileEditServlet.class
index 360145e..6956db7 100644
Binary files a/App/build/web/WEB-INF/classes/ProfileEditServlet.class and b/App/build/web/WEB-INF/classes/ProfileEditServlet.class differ
diff --git a/App/build/web/WEB-INF/classes/PurchaseOrders$Order.class b/App/build/web/WEB-INF/classes/PurchaseOrders$Order.class
deleted file mode 100644
index 0b9164c..0000000
Binary files a/App/build/web/WEB-INF/classes/PurchaseOrders$Order.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/PurchaseOrders.class b/App/build/web/WEB-INF/classes/PurchaseOrders.class
index c433137..69379d8 100644
Binary files a/App/build/web/WEB-INF/classes/PurchaseOrders.class and b/App/build/web/WEB-INF/classes/PurchaseOrders.class differ
diff --git a/App/build/web/WEB-INF/classes/RemoveFromCart.class b/App/build/web/WEB-INF/classes/RemoveFromCart.class
index 09f19a2..3d61e57 100644
Binary files a/App/build/web/WEB-INF/classes/RemoveFromCart.class and b/App/build/web/WEB-INF/classes/RemoveFromCart.class differ
diff --git a/App/build/web/WEB-INF/classes/RemoveItem.class b/App/build/web/WEB-INF/classes/RemoveItem.class
index 5a1a167..8fde0b7 100644
Binary files a/App/build/web/WEB-INF/classes/RemoveItem.class and b/App/build/web/WEB-INF/classes/RemoveItem.class differ
diff --git a/App/build/web/WEB-INF/classes/ShoppingCart.class b/App/build/web/WEB-INF/classes/ShoppingCart.class
deleted file mode 100644
index 8c17db4..0000000
Binary files a/App/build/web/WEB-INF/classes/ShoppingCart.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/SignupServlet.class b/App/build/web/WEB-INF/classes/SignupServlet.class
index c06fc68..c192f93 100644
Binary files a/App/build/web/WEB-INF/classes/SignupServlet.class and b/App/build/web/WEB-INF/classes/SignupServlet.class differ
diff --git a/App/build/web/WEB-INF/classes/StockBalance.class b/App/build/web/WEB-INF/classes/StockBalance.class
deleted file mode 100644
index f660f9d..0000000
Binary files a/App/build/web/WEB-INF/classes/StockBalance.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/Test.class b/App/build/web/WEB-INF/classes/Test.class
new file mode 100644
index 0000000..0dc8327
Binary files /dev/null and b/App/build/web/WEB-INF/classes/Test.class differ
diff --git a/App/build/web/WEB-INF/classes/admin/AddProductServlet.class b/App/build/web/WEB-INF/classes/admin/AddProductServlet.class
deleted file mode 100644
index b2ba323..0000000
Binary files a/App/build/web/WEB-INF/classes/admin/AddProductServlet.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/admin/EmbeddedJettyServer.class b/App/build/web/WEB-INF/classes/admin/EmbeddedJettyServer.class
deleted file mode 100644
index 1561f9f..0000000
Binary files a/App/build/web/WEB-INF/classes/admin/EmbeddedJettyServer.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/admin/ShoppingCart.class b/App/build/web/WEB-INF/classes/admin/ShoppingCart.class
deleted file mode 100644
index be62d0d..0000000
Binary files a/App/build/web/WEB-INF/classes/admin/ShoppingCart.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/cartSummary.class b/App/build/web/WEB-INF/classes/cartSummary.class
deleted file mode 100644
index bd15f95..0000000
Binary files a/App/build/web/WEB-INF/classes/cartSummary.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/classes/features/WishlistControllerServlet.class b/App/build/web/WEB-INF/classes/features/WishlistControllerServlet.class
deleted file mode 100644
index ea53de5..0000000
Binary files a/App/build/web/WEB-INF/classes/features/WishlistControllerServlet.class and /dev/null differ
diff --git a/App/build/web/WEB-INF/lib/mysql-connector-j-8.3.0.jar b/App/build/web/WEB-INF/lib/mysql-connector-j-8.3.0.jar
new file mode 100644
index 0000000..5c720ab
Binary files /dev/null and b/App/build/web/WEB-INF/lib/mysql-connector-j-8.3.0.jar differ
diff --git a/App/build/web/admin.jsp b/App/build/web/admin.jsp
index 25bb0af..76734eb 100644
--- a/App/build/web/admin.jsp
+++ b/App/build/web/admin.jsp
@@ -17,7 +17,7 @@
 
 
 <section class="container defalt-container-style d-flex justify-content-between align-items-center">
-    <h2 id="page_topic" class="m-0">Orders</h2>
+    <h3 id="page_topic" class="m-0">Orders</h3>
     <div class="d-flex justify-content-center align-items-center">
         <button id="button1" class="btn btn-primary mx-1 btn-sm">Orders</button>
         <button id="button2" class="btn btn-primary mx-1 btn-sm">Products</button>
@@ -36,128 +36,6 @@
     <jsp:include page="./SiteParts/admin_users.jsp" />
 </div>
 
-<section class="container defalt-container-style d-flex justify-content-between align-items-center">
-    <h3 id="page_topic" class="m-0">Orders</h3>
-    <div class="d-flex justify-content-center align-items-center">
-        <input id="searchInput" type="text" placeholder="Search...">
-        <button id="button1" class="btn btn-primary mx-1 btn-sm">Orders</button>
-        <button id="button2" class="btn btn-primary mx-1 btn-sm">Products</button>
-        <button id="button3" class="btn btn-primary mx-1 btn-sm">Users</button>
-    </div>
-</section>
-
-<section class="container defalt-container-style d-flex justify-content-between align-items-center">
-    <h3 id="page_topic" class="m-0">Orders</h3>
-    <div class="d-flex justify-content-center align-items-center">
-        <input id="searchInput" type="text" placeholder="Search...">
-        <button id="button1" class="btn btn-primary mx-1 btn-sm">Orders</button>
-        <button id="button2" class="btn btn-primary mx-1 btn-sm">Products</button>
-        <button id="button3" class="btn btn-primary mx-1 btn-sm">Users</button>
-    </div>
-</section>
-
-<script>
-    // Function to show Section 1 and hide Section 2
-    function showSection1() {
-        // your existing code here
-    }
-
-    // Function to show Section 2 and hide Section 1
-    function showSection2() {
-        // your existing code here
-    }
-
-    function showSection3() {
-        // your existing code here
-    }
-
-    // Add event listeners to the buttons
-    document.getElementById("button1").addEventListener("click", showSection1);
-    document.getElementById("button2").addEventListener("click", showSection2);
-    document.getElementById("button3").addEventListener("click", showSection3);
-
-    // Search functionality
-    document.getElementById("searchInput").addEventListener("input", function() {
-        let searchText = this.value.toLowerCase();
-        let currentPage = document.getElementById("page_topic").innerText.toLowerCase();
-        if (currentPage === "orders") {
-            searchOrders(searchText);
-        } else if (currentPage === "products") {
-            searchProducts(searchText);
-        } else if (currentPage === "users") {
-            searchUsers(searchText);
-        }
-    });
-    function connectOrders(searchText) {
-        // AddProductServlet connect any server-side logic to connect orders
-        // Update the display with connected results
-        document.getId("section1").style.dis = "block";
-        document.getId("section2").style.dis = "none";
-        document.getId("section3").style.dis = "none";
-    }
-    
-    function searchOrders(searchText) {
-        // AJAX call or any server-side logic to search orders
-        // Update the display with search results
-    }
-
-    function searchProducts(searchText) {
-        // AJAX call or any server-side logic to search products
-        // Update the display with search results
-    }
-
-    function searchUsers(searchText) {
-        // AJAX call or any server-side logic to search users
-        // Update the display with search results
-    }
-</script>
-
-<script>
-    // Function to show Section 1 and hide Section 2
-    function showSection1() {
-        // your existing code here
-    }
-    // Function to show Section 2 and hide Section 1
-    function showSection2() {
-        // your existing code here
-    }
-    function showSection3() {
-        // your existing code here
-    }
-    // Add event listeners to the buttons
-    document.getElementById("button1").addEventListener("click", showSection1);
-    document.getElementById("button2").addEventListener("click", showSection2);
-    document.getElementById("button3").addEventListener("click", showSection3);
-
-    // Search functionality
-    document.getElementById("searchInput").addEventListener("input", function() {
-        let searchText = this.value.toLowerCase();
-        let currentPage = document.getElementById("page_topic").innerText.toLowerCase();
-
-        if (currentPage === "orders") {
-            searchOrders(searchText);
-        } else if (currentPage === "products") {
-            searchProducts(searchText);
-        } else if (currentPage === "users") {
-            searchUsers(searchText);
-        }
-    });
-
-    function searchOrders(searchText) {
-        // AJAX call or any server-side logic to search orders
-        // Update the display with search results
-    }
-
-    function searchProducts(searchText) {
-        // AJAX call or any server-side logic to search products
-        // Update the display with search results
-    }
-
-    function searchUsers(searchText) {
-        // AJAX call or any server-side logic to search users
-        // Update the display with search results
-    }
-</script>
 
 <script>
     // Function to show Section 1 and hide Section 2
@@ -199,10 +77,11 @@
             pg_number = 3;
         }
     %>
+
     window.onload = function () {
         showSection<%=pg_number%>();
     };
 </script>
 
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/build/web/cart.jsp b/App/build/web/cart.jsp
index 9ccf27a..ff14911 100644
--- a/App/build/web/cart.jsp
+++ b/App/build/web/cart.jsp
@@ -40,6 +40,7 @@
     float final_price = 0;
 %>
 
+
 <div class="container mt-5">
     <div class="row">
         <div class="col-lg-8">
@@ -142,27 +143,6 @@
         </div>
     </div>
 </div>
-<script>
-function changeAmount(itemId, action) {
-    var quantityField = document.getElementById("quantity_in_" + itemId);
-    var quantity = parseInt(quantityField.value);
 
-    if (isNaN(quantity) || quantity <= 0) {
-        alert("Please enter a valid quantity.");
-        return;
-    }
 
-    if (action === 'inc') {
-        quantity++;
-    } else if (action === 'dec' && quantity > 1) {
-        quantity--;
-    } else {
-        alert("Invalid action.");
-        return;
-    }
-    quantityField.value = quantity;
-    // Update the quantity display in the table.
-    var quantityDisplay = document.getElementById("quantity_" + itemId);
-    quantityDisplay.textContent = quantity;
-}
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/build/web/contact-us.jsp b/App/build/web/contact-us.jsp
index e2c6e4f..92543cf 100644
--- a/App/build/web/contact-us.jsp
+++ b/App/build/web/contact-us.jsp
@@ -13,6 +13,7 @@
 <jsp:include page="./SiteParts/jambo.jsp" />   
 
 
+
 <section class="defalt-container-style container contact-section">
     <div class="contact-left">
         <h3 class="mb-4">Write Us</h3>
@@ -47,4 +48,4 @@
 </section>
 
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/build/web/discount.jsp b/App/build/web/discount.jsp
deleted file mode 100644
index 9a7879c..0000000
--- a/App/build/web/discount.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Add Discount</title>
-</head>
-<body>
-    <h1>--Add Discount--</h1>
-    <form action="applyDiscount.jsp" method="post">
-        Product ID: <input type="text" name="productId"><br>
-        Discount Percentage: <input type="text" name="discountPercentage"><br>
-        <input type="submit" value="Apply Discount">
-        <input type="reset" value="cancel">
-    </form>
-</body>
-</html>
diff --git a/App/build/web/index.jsp b/App/build/web/index.jsp
index b2a7bcc..699208d 100644
--- a/App/build/web/index.jsp
+++ b/App/build/web/index.jsp
@@ -24,7 +24,7 @@
                 <%=((HashMap) session.getAttribute("user")).get("first_name")%>
                 <%
                 } else { %>
-                Welcome..
+                Welcome...
                 <% }%>
             </h1>
             <p>This is the best place to buy hand watches!</p>
@@ -33,6 +33,7 @@
     </div>
 </section>
 
+
 <section class=" text-white p-0 container defalt-container-style">
     <div class="title_info text-center mb-5 mt-5">
         <h1 class="m-0">We Consider,</h1>
@@ -41,7 +42,7 @@
     <table class="table-sec">
         <tr class="tr-index">
             <td class="table-div image-container">
-                <img class="brand-img" src="img/3.jpg" alt="Rolex" width="100%">
+                <img class="brand-img" src="img/3.jpg" alt="" width="100%">
             </td>
             <td class="table-div text-table-div p-3">
                 <h3>Quality</h3>
@@ -104,4 +105,6 @@
     </div>
 </section>
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+
+
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/build/web/login.jsp b/App/build/web/login.jsp
index 85897dc..e936882 100644
--- a/App/build/web/login.jsp
+++ b/App/build/web/login.jsp
@@ -26,7 +26,7 @@
                     <input type="password" class="form-control defalt-input-style text-white form-control-sm" name="password" placeholder="Password" required>
                 </div>
 
-                <button class="btn btn-warning col-12 mt-5 mb-3" type="submit">Log In</button>
+                <button class="btn btn-warning col-12 mt-5" type="submit">Log In</button>
             </form>
 
             <div class="text-white light-container-style">
diff --git a/App/build/web/orders.jsp b/App/build/web/orders.jsp
index a8fa090..a8b6c67 100644
--- a/App/build/web/orders.jsp
+++ b/App/build/web/orders.jsp
@@ -16,7 +16,7 @@
     request.setAttribute("description", "You can see all the products that you ordered.");
 %>
 <jsp:include page="./SiteParts/dash_header.jsp" />
-<jsp:include page="./SiteParts/alerts.jsp" />    
+<jsp:include page="./SiteParts/alerts.jsp" />   
 
 <jsp:include page="./SiteParts/submenubar.jsp" />
 
@@ -172,4 +172,4 @@
 <!--MODEL-->
 
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/build/web/pagination.jsp b/App/build/web/pagination.jsp
deleted file mode 100644
index 1c46db7..0000000
--- a/App/build/web/pagination.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ page import="java.util.List, java.util.ArrayList" %>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Products Page</title>
-</head>
-<body>
-    <h1>Products</h1>
-    
-    <% List<String> productList = new ArrayList<>(); %>
-    <% for (int i = 1; i <= 50; i++) {
-        productList.add("Product " + i);
-    } %>
-    
-    <%-- Pagination parameters --%>
-    <% int pageSize = 10; %>
-    <% int page = (request.getParameter("page") != null) ? Integer.parseInt(request.getParameter("page")) : 1; %>
-    <% int totalPages = (int) Math.ceil((double) productList.size() / pageSize); %>
-    <% int start = (page - 1) * pageSize; %>
-    <% int end = Math.min(start + pageSize, productList.size()); %>
-    
-    <%-- Display products for the current page --%>
-    <ul>
-        <% for (int i = start; i < end; i++) { %>
-            <li><%= productList.get(i) %></li>
-        <% } %>
-    </ul>
-    
-    <%-- Pagination links --%>
-    <% if (totalPages > 1) { %>
-        <div>
-            <% if (page > 1) { %>
-                <a href="products.jsp?page=<%= page - 1 %>">Previous</a>
-            <% } %>
-            
-            <% for (int i = 1; i <= totalPages; i++) { %>
-                <% if (i == page) { %>
-                    <%= i %>
-                <% } else { %>
-                    <a href="products.jsp?page=<%= i %>"><%= i %></a>
-                <% } %>
-            <% } %>
-            
-            <% if (page < totalPages) { %>
-                <a href="products.jsp?page=<%= page + 1 %>">Next</a>
-            <% } %>
-        </div>
-    <% } %>
-</body>
-</html>
diff --git a/App/build/web/productDetailsPage.jsp b/App/build/web/productDetailsPage.jsp
deleted file mode 100644
index 7125b16..0000000
--- a/App/build/web/productDetailsPage.jsp
+++ /dev/null
@@ -1,17 +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>
-<head>
-    <meta charset="UTF-8">
-    <title>Product Details</title>
-</head>
-<body>
-    <h1>${product.name}</h1>
-    <p>${product.description}</p>
-    <form action="addToWishlist" method="post">
-        <input type="hidden" name="productId" value="${product.id}">
-        <input type="submit" value="Add to Wishlist">
-    </form>
-</body>
-</html>
diff --git a/App/checkout.html b/App/checkout.html
deleted file mode 100644
index 3dfbf3a..0000000
--- a/App/checkout.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <title>Checkout</title>
-    <link rel="stylesheet" type="text/css" href="styles.css">
-</head>
-<body>
-    <div class="checkout-container">
-        <h2>Checkout</h2>
-        <!-- Your checkout form and other elements go here -->
-    </div>
-</body>
-</html>
diff --git a/App/javacontroller.java b/App/javacontroller.java
deleted file mode 100644
index 53055e0..0000000
--- a/App/javacontroller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class HomeController {
-
-    @GetMapping("/")
-    public String home(Model model) {
-        List<Item> newArrivals = getNewArrivals();
-        
-        model.addAttribute("newArrivals", newArrivals);
-        
-        return "index";
-    }
-
-    private List<Item> getNewArrivals() {
-        List<Item> newArrivals = new ArrayList<>();
-        newArrivals.add(new Item("Item 1"));
-        newArrivals.add(new Item("Item 2"));
-        newArrivals.add(new Item("Item 3"));
-        newArrivals.add(new Item("Item 2"));
-        newArrivals.add(new Item("Item 3"));
-        return newArrivals;
-    }
-}
diff --git a/App/nbproject/private/private.properties b/App/nbproject/private/private.properties
index 17d4f39..1bc4475 100644
--- a/App/nbproject/private/private.properties
+++ b/App/nbproject/private/private.properties
@@ -1,5 +1,5 @@
-deploy.ant.properties.file=C:\\Users\\Kavindu R\\AppData\\Roaming\\NetBeans\\20\\tomcat80.properties
-file.reference.mysql-connector-j-8.3.0.jar=C:\\Users\\Kavindu R\\Documents\\App\\jsp-web-project\\App\\web\\WEB-INF\\lib\\mysql-connector-j-8.3.0.jar
+deploy.ant.properties.file=C:\\Users\\ASUS\\AppData\\Roaming\\NetBeans\\18\\tomcat80.properties
+file.reference.mysql-connector-j-8.3.0.jar=C:\\Users\\ASUS\\Desktop\\DEA_web\\jsp-web-project - ORG\\App\\web\\WEB-INF\\lib\\mysql-connector-j-8.3.0.jar
 j2ee.server.home=C:/xampp/tomcat
 j2ee.server.instance=tomcat80:home=C:\\xampp\\tomcat
-user.properties.file=C:\\Users\\Kavindu R\\AppData\\Roaming\\NetBeans\\20\\build.properties
+user.properties.file=C:\\Users\\ASUS\\AppData\\Roaming\\NetBeans\\18\\build.properties
diff --git a/App/nbproject/private/private.xml b/App/nbproject/private/private.xml
index 6668ac7..6fcdc11 100644
--- a/App/nbproject/private/private.xml
+++ b/App/nbproject/private/private.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-<<<<<<< HEAD
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Users/chethaka/OneDrive%20-%20NSBM/2nd%20year/DEA/05%20Assignments/app/jsp-web-project/App/src/java/EmbeddedJettyServer.java</file>
-            <file>file:/C:/Users/chethaka/OneDrive%20-%20NSBM/2nd%20year/DEA/05%20Assignments/app/jsp-web-project/App/web/productDetailsPage.jsp</file>
-            <file>file:/C:/Users/chethaka/OneDrive%20-%20NSBM/2nd%20year/DEA/05%20Assignments/app/jsp-web-project/App/src/java/ShoppingCart.java</file>
+            <file>file:/C:/Users/ASUS/Desktop/DEA_web/jsp-web-project%20-%20ORG/App/src/java/Config/Config.java</file>
         </group>
     </open-files>
-=======
->>>>>>> 027cc825d0296a16baa3d7e2fc2fbc408d21f873
 </project-private>
diff --git a/App/nbproject/project.properties b/App/nbproject/project.properties
index 69f8472..26cbcc1 100644
--- a/App/nbproject/project.properties
+++ b/App/nbproject/project.properties
@@ -45,8 +45,8 @@ javac.debug=true
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=17
-javac.target=17
+javac.source=20
+javac.target=20
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/App/src/java/AddToCart.java b/App/src/java/AddToCart.java
index 8f14f2c..1da4564 100644
--- a/App/src/java/AddToCart.java
+++ b/App/src/java/AddToCart.java
@@ -22,7 +22,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         String role = (String) session.getAttribute("role");
 
         if (session == null || role == null) {
-            response.sendRedirect("./login.jsp?err=Please Login to place orders.");
+            response.sendRedirect("./login.jsp?err=Please Login to place orders");
             return;
         }
 
@@ -32,11 +32,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         HashMap<Integer, HashMap<String, Object>> cart = (HashMap<Integer, HashMap<String, Object>>) session.getAttribute("cart");
 
         cart = func.addItemToCart(cart, id);
-            
+
         if (cart == null) {
-            response.sendRedirect("./products.jsp?err=Item already added to the cart.");
+            response.sendRedirect("./products.jsp?err=Item already added to the cart");
             return;
         }
+
         int cart_size = 0;
         if (cart.size() > 0) {
             for (int key : cart.keySet()) {
diff --git a/App/src/java/ChangeAmount.java b/App/src/java/ChangeAmount.java
index 8abbceb..4e631fa 100644
--- a/App/src/java/ChangeAmount.java
+++ b/App/src/java/ChangeAmount.java
@@ -1,3 +1,4 @@
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashMap;
@@ -8,7 +9,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-@WebServlet("/ChangeAmount")
+@WebServlet(urlPatterns = {"/ChangeAmount"})
 public class ChangeAmount extends HttpServlet {
 
     @Override
@@ -18,41 +19,38 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         HttpSession session = request.getSession(false);
         PrintWriter out = response.getWriter();
 
-        String id = request.getParameter("id");
-        String method = request.getParameter("method");
+        String id = (String) request.getParameter("id");
+        String method = (String) request.getParameter("method");
 
         if (session == null || session.getAttribute("role") == null) {
-            response.sendRedirect("./login.jsp?err=Please Login to place orders!!!");
-            return;
+            response.sendRedirect("./login.jsp?err=Please Login to place orders");
         }
         if (id != null && method != null) {
             HashMap<Integer, HashMap<String, Object>> cart = (HashMap<Integer, HashMap<String, Object>>) session.getAttribute("cart");
 
-            int productId = Integer.parseInt(id);
+            int product_id = Integer.parseInt(id);
+
+            if (method.equals("inc")) {
+                int item_count = (int) cart.get(product_id).get("items");
 
-            if (cart.containsKey(productId)) {
-                int itemCount = (int) cart.get(productId).get("items");
-                int availableCount = (int) cart.get(productId).get("available_count");
+                if ((int) cart.get(product_id).get("available_count") > item_count) {
+                    item_count++;
+                    cart.get(product_id).put("items", item_count);
+                    out.println("{\"id\":" + id + ", \"value\":" + item_count + "}");
+                } else {
+                    out.println("{\"id\":" + id + ", \"value\":" + item_count + "}");
+                }
 
-                if ("inc".equals(method) && availableCount > itemCount) {
-                    itemCount++;
-                    cart.get(productId).put("items", itemCount);
-                    out.println("{\"id\":" + id + ", \"value\":" + itemCount + "}");
-                } else if ("dec".equals(method) && itemCount > 1) {
-                    itemCount--;
-                    cart.get(productId).put("items", itemCount);
-                    out.println("{\"id\":" + id + ", \"value\":" + itemCount + "}");
+            } else if (method.equals("dec")) {
+                int item_count = (int) cart.get(product_id).get("items");
+                if (item_count > 1) {
+                    item_count = item_count - 1;
+                    cart.get(product_id).put("items", item_count);
+                    out.println("{\"id\":" + id + ", \"value\":" + item_count + "}");
                 } else {
-                    // No change in item count
-                    out.println("{\"id\":" + id + ", \"value\":" + itemCount + "}");
+                    out.println("{\"id\":" + id + ", \"value\":" + item_count + "}");
                 }
-            } else {
-                // Product not found in cart
-                out.println("{\"id\":" + id + ", \"value\":0}");
             }
-        } else {
-            // Invalid request parameters
-            out.println("{\"id\":0, \"value\":0}");
         }
     }
 }
diff --git a/App/src/java/ChangeOrderStatus.java b/App/src/java/ChangeOrderStatus.java
index 0ac7ff2..9ec3239 100644
--- a/App/src/java/ChangeOrderStatus.java
+++ b/App/src/java/ChangeOrderStatus.java
@@ -1,5 +1,7 @@
+
 import Config.DB;
 import java.io.IOException;
+import java.io.PrintWriter;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -15,26 +17,21 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
         HttpSession session = request.getSession(false);
-        if (session == null || session.getAttribute("role") == null || !session.getAttribute("role").equals("admin")) {
+        if (session == null || !(session.getAttribute("role").equals("admin"))) {
             response.sendRedirect("./login.jsp?err=Please Login to place orders");
             return;
         }
-
-        String order_id = request.getParameter("order_id");
-        String status = request.getParameter("status");
-
-        if (order_id == null || order_id.trim().isEmpty() || status == null || status.trim().isEmpty()) {
-            response.sendRedirect("./admin.jsp?page=orders&err=Invalid input parameters");
-            return;
-        }
+        String order_id = request.getParameter("order_id").trim();
+        String status = request.getParameter("status").trim();
 
         DB db = new DB();
-        int res = db.updateOrderStatus(order_id.trim(), status.trim());
-        
+        int res = db.updateOrderStatus(order_id, status);
         if (res > 0) {
             response.sendRedirect("./admin.jsp?page=orders&ok=Status Changed Successfully");
-        } else {
-            response.sendRedirect("./admin.jsp?page=orders&err=Server Error");
+            return;
         }
+        response.sendRedirect("./admin.jsp?page=orders&err=Server Error");
+
     }
+
 }
diff --git a/App/src/java/Config/Config.java b/App/src/java/Config/Config.java
index 6802867..5d64006 100644
--- a/App/src/java/Config/Config.java
+++ b/App/src/java/Config/Config.java
@@ -2,7 +2,7 @@
 
 public class Config {
 
-    String PORT = "3306";
+    String PORT = "8111";
     String DB_NAME = "java_web";
     public static String ITEM_COUNT_CHANGE_API = "http://localhost:8080/App/ChangeAmount";
     public static String ADD_TO_CART_API = "http://localhost:8080/App/AddToCart";
diff --git a/App/src/java/Config/DB.java b/App/src/java/Config/DB.java
index c56623d..bf3586e 100644
--- a/App/src/java/Config/DB.java
+++ b/App/src/java/Config/DB.java
@@ -2,7 +2,6 @@
 
 import java.sql.*;
 import java.util.HashMap;
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -298,16 +297,4 @@ public int contactus(String name, String email, String subject, String message)
         int x = this.run_sql(sql);
         return x;
     }
-
-    public boolean isEmailTaken(String email, String username) {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
-    public List<.PurchaseOrders.Order> getOrdersByUserIdSortedByDate(int userId) {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
-    public List<.PurchaseOrders.Order> getOrdersByUserIdSortedByDate(int userId) {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
 }
diff --git a/App/src/java/ContactUs.java b/App/src/java/ContactUs.java
index 7ed940b..4c208f7 100644
--- a/App/src/java/ContactUs.java
+++ b/App/src/java/ContactUs.java
@@ -1,43 +1,35 @@
+
 import Config.DB;
 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("/ContactUs")
+@WebServlet(urlPatterns = {"/ContactUs"})
 public class ContactUs extends HttpServlet {
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        // Retrieve parameters from the request
         String name = request.getParameter("name");
         String email = request.getParameter("email");
         String subject = request.getParameter("subject");
         String message = request.getParameter("message");
 
-        // Check if all required fields are filled
-        if (isNullOrEmpty(name) || isNullOrEmpty(email) || isNullOrEmpty(subject) || isNullOrEmpty(message)) {
-            response.sendRedirect("./contact-us.jsp?err=Please Fill All Required Fields");
-            return;
-        }
-
-        // Save the message in the database
-        DB db = new DB();
-        int result = db.contactus(name, email, subject, message);
-        
-        // Redirect based on the result
-        if (result > 0) {
-            response.sendRedirect("./contact-us.jsp?ok=Your message has been sent successfully");
+        if (name != null && email != null && subject != null && message != null) {
+            DB db = new DB();
+            int x = db.contactus(name, email, subject, message);
+            if (x > 0) {
+                response.sendRedirect("./contact-us.jsp?ok=Your message has been sent successfully");
+            } else {
+                response.sendRedirect("./contact-us.jsp?err=Server Error");
+            }
         } else {
-            response.sendRedirect("./contact-us.jsp?err=Server Error");
+            response.sendRedirect("./contact-us.jsp?err=Please Fill All Required fields");
         }
     }
 
-    // Method to check if a string is null or empty
-    private boolean isNullOrEmpty(String str) {
-        return str == null || str.trim().isEmpty();
-    }
 }
diff --git a/App/src/java/DatabaseConnector.java b/App/src/java/DatabaseConnector.java
deleted file mode 100644
index 73d79a0..0000000
--- a/App/src/java/DatabaseConnector.java
+++ /dev/null
@@ -1,38 +0,0 @@
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-public class DatabaseConnector {
-
-    public static Connection connectToDatabase() {
-        Connection connection = null;
-        try {
-            String url = "jdbc:sql://http:3306/java_web";
-            String user = "johndoe";
-            String password = "@1234";
-
-            connection = DriverManager.getConnection(url, user, password);
-            System.out.println("Connected to the database successfully!");
-        } catch (SQLException e) {
-            System.out.println("Error connecting to the database: " + e.getMessage());
-        }
-        return connection;
-    }
-
-    public static void closeConnection(Connection connection) {
-        if (connection != null) {
-            try {
-                connection.close();
-                System.out.println("Database connection closed.");
-            } catch (SQLException e) {
-                System.out.println("Error closing database connection: " + e.getMessage());
-            }
-        }
-    }
-
-    public static void main(String[] args) {
-
-        Connection connection = connectToDatabase();
-        closeConnection(connection);
-    }
-}
diff --git a/App/src/java/EmbeddedJettyServer.java b/App/src/java/EmbeddedJettyServer.java
deleted file mode 100644
index c97f9a0..0000000
--- a/App/src/java/EmbeddedJettyServer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-public class EmbeddedJettyServer {
-    public static void main(String[] args) {
-        int port = 8080; // Set the port for the server
-
-        //Server server = new Server(port);
-
-        // Define the path to your WAR file or web application directory
-        String webappPath = "path/to/your/webapp";
-
-        // Create a WebAppContext for the web application
-        //WebAppContext webappContext = new WebAppContext();
-        //webappContext.setContextPath("/");
-        //webappContext.setWar(webappPath);
-
-        // Attach the WebAppContext to the server
-        //server.setHandler(webappContext);
-
-        try {
-            // Start the server
-            //server.start();
-            //server.join(); // Wait for the server to finish starting
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            // Stop the server when finished
-            try {
-                //server.stop();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/App/src/java/HttpServletRequest.java b/App/src/java/HttpServletRequest.java
deleted file mode 100644
index 76cb313..0000000
--- a/App/src/java/HttpServletRequest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-
-import javax.servlet.http.HttpSession;
-
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-
-/**
- *
- * @author shyam
- */
-class HttpServletRequest {
-
-    HttpSession getSession() {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-    
-}
diff --git a/App/src/java/NewTest.java b/App/src/java/NewTest.java
new file mode 100644
index 0000000..dc79723
--- /dev/null
+++ b/App/src/java/NewTest.java
@@ -0,0 +1,27 @@
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+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(urlPatterns = {"/NewTest"})
+public class NewTest extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        PrintWriter out = response.getWriter();
+        Enumeration<String> headers = request.getHeaderNames();
+        while (headers.hasMoreElements()) {
+            String key = headers.nextElement();
+            out.println(key + " : " + request.getHeader(key));
+        }
+
+    }
+
+}
diff --git a/App/src/java/OrderDate.java b/App/src/java/OrderDate.java
deleted file mode 100644
index 936c273..0000000
--- a/App/src/java/OrderDate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-
-import java.io.IOException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
-
-@WebServlet(urlPatterns = {"/OrderDate"})
-public class OrderDate extends HttpServlet {
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        processRequest(request, response);
-        Object orderDate = null;
-        request.setAttribute("orderDate", orderDate);
-        RequestDispatcher dispatcher = request.getRequestDispatcher("yourJSP.jsp");
-        dispatcher.forward(request, response);
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedOrderDate = dateFormat.format(orderDate);
-   
-        request.setAttribute("orderDate", formattedOrderDate);
-    }
-    private void processRequest(HttpServletRequest request, HttpServletResponse response) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-  
-}
-                                                                                                                            
\ No newline at end of file
diff --git a/App/src/java/ProfileEditServlet.java b/App/src/java/ProfileEditServlet.java
index d82b0ed..1bc7812 100644
--- a/App/src/java/ProfileEditServlet.java
+++ b/App/src/java/ProfileEditServlet.java
@@ -1,5 +1,7 @@
+
 import Config.DB;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -14,30 +16,32 @@ public class ProfileEditServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
+        
         HttpSession session = request.getSession(false);
         if (session == null || session.getAttribute("role") == null) {
-            response.sendRedirect("./login.jsp?err=Please Login to place orders!!");
+            response.sendRedirect("./login.jsp?err=Please Login to place orders");
             return;
         }
 
         String username = request.getParameter("username");
-        String firstName = request.getParameter("first_name");
-        String lastName = request.getParameter("last_name");
+        String first_name = request.getParameter("first_name");
+        String last_name = request.getParameter("last_name");
         String email = request.getParameter("email");
         String gender = request.getParameter("gender");
 
         DB db = new DB();
 
-        if (db.isEmailTaken(email, username)) {
-            response.sendRedirect("profile.jsp?err=Email Already Exists. Try Another One");
+        if (db.checkEmail2(email, username) == 0) {
+            response.sendRedirect("profile.jsp?err=Email Alredy Exists. Try Another One");
             return;
         }
 
-        HashMap<String, String> updatedUser = db.updateUser(username, firstName, lastName, email, gender);
+        HashMap user = db.updateUser(username, first_name, last_name, email, gender);
+
+        if (user != null) {
+            session.setAttribute("user", user);
+            response.sendRedirect("profile.jsp?ok=You Details Updated Successfully");
 
-        if (updatedUser != null) {
-            session.setAttribute("user", updatedUser);
-            response.sendRedirect("profile.jsp?ok=Your Details Updated Successfully");
         } else {
             response.sendRedirect("profile.jsp?err=Server Error");
         }
diff --git a/App/src/java/PurchaseOrders.java b/App/src/java/PurchaseOrders.java
index e231f1f..e574ab2 100644
--- a/App/src/java/PurchaseOrders.java
+++ b/App/src/java/PurchaseOrders.java
@@ -1,59 +1,55 @@
+
 import Config.DB;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.util.HashMap;
-import java.util.List;
-import org.apache.catalina.servlets.DefaultServlet.SortManager.Order;
 
-@WebServlet("/PurchaseOrders")
+@WebServlet(urlPatterns = {"/PurchaseOrders"})
 public class PurchaseOrders extends HttpServlet {
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
+
         HttpSession session = request.getSession(false);
-        if (session == null || session.getAttribute("role") == null) {
+        if (session == null || (session.getAttribute("role")) == null) {
             response.sendRedirect("./login.jsp?err=Please Login to place orders");
             return;
         }
 
-        // Get user information from the session
-        HashMap<String, Object> user = (HashMap<String, Object>) session.getAttribute("user");
-        int userId = (int) user.get("uid");
-        String username = (String) user.get("username");
-
-        // Get the person parameter from the request
+        HashMap user = (HashMap) session.getAttribute("user");
+        int uid = Integer.parseInt((String) user.get("uid"));
         String person = request.getParameter("person");
 
-        // Check if the person matches the logged-in user
-        if (Integer.toString(userId).equals(person)) {
-            DB db = new DB();
-            // Retrieve orders sorted by date
-            List<Order> orders = db.getOrdersByUserIdSortedByDate(userId);
+        if (Integer.parseInt(person) == uid) {
+            PrintWriter out = response.getWriter();
+            HashMap<Integer, HashMap<String, Object>> cart = (HashMap<Integer, HashMap<String, Object>>) session.getAttribute("cart");
 
-            if (orders.isEmpty()) {
-                // No orders found
-                response.sendRedirect("./cart.jsp?err=No orders found for this user");
+            DB db = new DB();
+            int x = db.placeOrder(uid, (String) user.get("username"), cart);
+            if (x > 0) {
+                response.sendRedirect("./orders.jsp?ok=Order Completed");
+                HashMap<Integer, HashMap<String, Object>> new_cart = new HashMap<>();
+                session.setAttribute("cart", new_cart);
+                return;
+            } else if (x == 0) {
+                response.sendRedirect("./cart.jsp?err=Please select at least one item");
+                return;
+            } else {
+                response.sendRedirect("./cart.jsp?err=Server Error");
                 return;
             }
 
-            // Process orders...
-            // For demonstration purposes, let's just print them out
-            orders.forEach(order -> {
-                System.out.println(order);
-            });
-
-            // You can continue processing the orders as needed
-
-            response.sendRedirect("./orders.jsp?ok=Orders Retrieved Successfully");
         } else {
-            // Person parameter does not match the logged-in user
             response.sendRedirect("./index.jsp");
+            return;
         }
+
     }
 }
diff --git a/App/src/java/RemoveItem.java b/App/src/java/RemoveItem.java
index 10d8913..9837125 100644
--- a/App/src/java/RemoveItem.java
+++ b/App/src/java/RemoveItem.java
@@ -1,40 +1,40 @@
+
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.util.HashMap;
 
+/**
+ *
+ * @author ASUS
+ */
 @WebServlet(urlPatterns = {"/RemoveItem"})
 public class RemoveItem extends HttpServlet {
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        
+
         HttpSession session = request.getSession(false);
-        
-        // Check if session exists and user is logged in
+        int id = Integer.parseInt(request.getParameter("id"));
+
         if (session == null || session.getAttribute("role") == null) {
             response.sendRedirect("./login.jsp?err=Please Login to place orders");
             return;
         }
-        
-        // Get the product ID to remove from the cart
-        int id = Integer.parseInt(request.getParameter("id"));
-        
-        // Retrieve the cart from the session
         HashMap<Integer, HashMap<String, Object>> cart = (HashMap<Integer, HashMap<String, Object>>) session.getAttribute("cart");
-        
-        // Check if the cart contains the item to remove
-        if (cart != null && cart.containsKey(id)) {
-            // Remove the item from the cart
+        if (cart.containsKey(id)) {
             cart.remove(id);
             response.sendRedirect("./cart.jsp?ok=Item removed from the cart");
+            
         } else {
             response.sendRedirect("./cart.jsp?err=No items to remove");
         }
     }
+
 }
diff --git a/App/src/java/ShoppingCart.java b/App/src/java/ShoppingCart.java
deleted file mode 100644
index 16e99e6..0000000
--- a/App/src/java/ShoppingCart.java
+++ /dev/null
@@ -1,47 +0,0 @@
-import java.util.HashMap;
-import java.util.Map;
-
-public class ShoppingCart {
-    private Map<String, Integer> items;
-    private double totalPrice;
-    private String discountCode;
-    private double discountAmount;
-
-    public ShoppingCart() {
-        items = new HashMap<>();
-        totalPrice = 0.0;
-        discountCode = "";
-        discountAmount = 0.0;
-    }
-    public void addItem(String item, int quantity, double pricePerItem) {
-        items.put(item, items.getOrDefault(item, 0) + quantity);
-        totalPrice += quantity * pricePerItem;
-    }
-    public void applyDiscount(String code, double discountPercentage) {
-        if (code.equals(discountCode)) {
-            System.out.println("Discount code already applied.");
-            return;
-        }
-        discountCode = code;
-        double discount = totalPrice * discountPercentage / 100;
-        discountAmount = Math.min(discount, totalPrice); 
-        
-        totalPrice -= discountAmount;
-        System.out.println("Discount applied successfully.");
-    }
-    public double getTotalPrice() {
-        return totalPrice;
-    }
-    public double getDiscountAmount() {
-        return discountAmount;
-    }
-    public static void main(String[] args) {
-        ShoppingCart cart = new ShoppingCart();
-        cart.addItem("Product 1", 2, 10.0);
-        cart.addItem("Product 2", 1, 20.0);
-        System.out.println("Total price before discount: " + cart.getTotalPrice());
-        cart.applyDiscount("DISCOUNT25", 25);
-        System.out.println("Total price after discount: " + cart.getTotalPrice());
-        System.out.println("Discount amount: " + cart.getDiscountAmount());
-    }
-}
diff --git a/App/src/java/SignupServlet.java b/App/src/java/SignupServlet.java
index 8a55918..044762c 100644
--- a/App/src/java/SignupServlet.java
+++ b/App/src/java/SignupServlet.java
@@ -1,10 +1,13 @@
+
 import Config.DB;
 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;
+import Config.DB;
 
 @WebServlet(urlPatterns = {"/SignupServlet"})
 public class SignupServlet extends HttpServlet {
@@ -12,7 +15,8 @@ public class SignupServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        
+        response.setContentType("text/html");
+
         String first_name = request.getParameter("first_name");
         String last_name = request.getParameter("last_name");
         String gender = request.getParameter("gender");
@@ -21,71 +25,33 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         String password = request.getParameter("password");
         String password_rep = request.getParameter("password_rep");
 
-        // Check if any required field is empty
-        if (isEmpty(username) || isEmpty(email) || isEmpty(password) || isEmpty(password_rep)
-                || isEmpty(first_name) || isEmpty(last_name) || isEmpty(gender)) {
-            redirectWithError(response, "All fields need to be filled");
-            return;
-        }
+        String regex = "^[a-zA-Z0-9]*$";
 
-        // Check if username contains only alphanumeric characters
-        if (!isValidUsername(username)) {
-            redirectWithError(response, "Username can only contain characters from a-z and 0-9");
-            return;
-        }
-
-        // Check if password contains at least one special character
-        if (!containsSpecialCharacter(password)) {
-            redirectWithError(response, "Password needs to have at least one special character");
-            return;
-        }
-
-        // Check if passwords match
-        if (!password.equals(password_rep)) {
-            redirectWithError(response, "Passwords do not match");
-            return;
-        }
+        String specialCharRegex = ".*[!@#$%^&*()\\-_=+\\\\|\\[{\\]};:'\",<.>/?`~].*";
 
         DB db = new DB();
 
-        // Check if username already exists
-        if (db.checkUsername(username) > 0) {
-            redirectWithError(response, "Username already exists. Please try another one");
-            return;
-        }
-
-        // Check if email already exists
-        if (db.checkEmail(email) > 0) {
-            redirectWithError(response, "Email already exists. Please try another one");
-            return;
-        }
-
-        // Register the user
-        int result = db.registerUser(username, password, first_name, last_name, gender, email);
-        if (result > 0) {
-            response.sendRedirect("signup.jsp?ok=User registered successfully");
+        if (username != null && !username.matches(regex)) {
+            response.sendRedirect("signup.jsp?err=Username can only be characters from a-z and 0-9");
+        } else if (password != null && !password.matches(specialCharRegex)) {
+            response.sendRedirect("signup.jsp?err=Password needs to have at least one special character");
+        } else if (password != null && !password.equals(password_rep)) {
+            response.sendRedirect("signup.jsp?err=Passwords did not matched");
+        } else if (username == null || email == null || password == null || password_rep == null || first_name == null || last_name == null || gender == null || username == "" || email == "" || password == "" || password_rep == "" || first_name == "" || last_name == "" || gender == "") {
+            response.sendRedirect("signup.jsp?err=All fields needs to be filled");
+        } else if (0 < db.checkUsername(username)) {
+            response.sendRedirect("signup.jsp?err=Username Already exsists. Try another one");
+        } else if (0 < db.checkEmail(email)) {
+            response.sendRedirect("signup.jsp?err=Email Already exsists. Try another one");
         } else {
-            redirectWithError(response, "Server Error");
-        }
-    }
-
-    // Method to check if a string is empty or null
-    private boolean isEmpty(String str) {
-        return str == null || str.trim().isEmpty();
-    }
-
-    // Method to check if username contains only alphanumeric characters
-    private boolean isValidUsername(String username) {
-        return username.matches("^[a-zA-Z0-9]*$");
-    }
 
-    // Method to check if password contains at least one special character
-    private boolean containsSpecialCharacter(String password) {
-        return password.matches(".*[!@#$%^&*()\\-_=+\\\\|\\[{\\]};:'\",<.>/?`~].*");
+            int x = db.registerUser(username, password, first_name, last_name, gender, email);
+            if (x > 0) {
+                response.sendRedirect("signup.jsp?ok=User Registered successfully");
+            } else {
+                response.sendRedirect("signup.jsp?err=Server Error");
+            }
+        }
     }
 
-    // Method to redirect with an error message
-    private void redirectWithError(HttpServletResponse response, String errorMessage) throws IOException {
-        response.sendRedirect("signup.jsp?err=" + errorMessage);
-    }
 }
diff --git a/App/src/java/StockBalance.java b/App/src/java/StockBalance.java
deleted file mode 100644
index ed58f9a..0000000
--- a/App/src/java/StockBalance.java
+++ /dev/null
@@ -1,33 +0,0 @@
-import java.io.IOException;
-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("/StockBalance")
-public class StockBalance extends HttpServlet {
-
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        // Your processing logic goes here
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    @Override
-    public String getServletInfo() {
-        return "Stock Balance Servlet";
-    }
-}
diff --git a/App/src/java/Test.java b/App/src/java/Test.java
new file mode 100644
index 0000000..17e023a
--- /dev/null
+++ b/App/src/java/Test.java
@@ -0,0 +1,31 @@
+
+import Config.DB;
+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;
+import Config.DB;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.servlet.http.HttpSession;
+
+@WebServlet(urlPatterns = {"/Test"})
+public class Test extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        PrintWriter out = response.getWriter();
+        out.println(request.getParameter("a"));
+        out.println(request.getSession(false).getAttribute("cart"));
+        out.println(request.getSession(false).getAttribute("user"));
+
+    }
+}
diff --git a/App/src/java/admin/AddProductServlet.java b/App/src/java/admin/AddProductServlet.java
deleted file mode 100644
index c0c79e3..0000000
--- a/App/src/java/admin/AddProductServlet.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package admin;
-
-import java.io.*;
-import java.sql.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-public class AddProductServlet extends HttpServlet {
-    public void doPost(HttpServletRequest request, HttpServletResponse response) 
-      throws ServletException, IOException {
-        Connection conn = null;
-        PreparedStatement stmt = null;
-
-        try {
-            Class.forName("com.mysql.jdbc.Driver");
-
-            conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/database", "username", "password");
-
-            String sql = "INSERT INTO products (name, price) VALUES (?, ?)";
-            stmt = conn.prepareStatement(sql);
-            stmt.setString(1, request.getParameter("name"));
-            stmt.setDouble(2, Double.parseDouble(request.getParameter("price")));
-
-            int rowsAffected = stmt.executeUpdate();
-
-            if (rowsAffected > 0) {
-                response.sendRedirect("success.jsp");
-            } else {
-                response.sendRedirect("error.jsp");
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            response.sendRedirect("error.jsp");
-        } finally {
-            
-            try {
-                if (stmt != null) {
-                    stmt.close();
-                }
-                if (conn != null) {
-                    conn.close();
-                }
-            } catch (SQLException ex) {
-                ex.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/App/src/java/admin/DeleteProductServelet.java b/App/src/java/admin/DeleteProductServelet.java
deleted file mode 100644
index 3756b78..0000000
--- a/App/src/java/admin/DeleteProductServelet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package admin;
-
-import java.util.*;
-
-class ShoppingCart {
-    private List<String> products;
-
-    public ShoppingCart() {
-        products = new ArrayList<>();
-    }
-
-    public void addProduct(String product) {
-        products.add(product);
-    }
-
-    public void removeProduct(String product) {
-        if (products.contains(product)) {
-            products.remove(product);
-            System.out.println(product + " removed from the cart.");
-        } else {
-            System.out.println(product + " is not in the cart.");
-        }
-    }
-
-    public void displayCart() {
-        System.out.println("Products in the cart:");
-        for (String product : products) {
-            System.out.println("- " + product);
-        }
-    }
-}
-
diff --git a/App/src/java/admin/Logout.java b/App/src/java/admin/Logout.java
deleted file mode 100644
index 2094a1c..0000000
--- a/App/src/java/admin/Logout.java
+++ /dev/null
@@ -1,21 +0,0 @@
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-@WebServlet("/AdminLogout")
-public class Logout extends HttpServlet {
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        HttpSession session = request.getSession(false); 
-
-        if (session != null) {
-            session.invalidate();
-            response.sendRedirect("AdminLogin.jsp"); 
-        } else {
-            response.sendRedirect("AdminLogin.jsp"); 
-        }
-    }
-}
diff --git a/App/src/java/cartSummary.java b/App/src/java/cartSummary.java
deleted file mode 100644
index ae09ba9..0000000
--- a/App/src/java/cartSummary.java
+++ /dev/null
@@ -1,39 +0,0 @@
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.util.*;
-
-public class cartSummary extends HttpServlet {
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-
-        HttpSession session = request.getSession();
-        Map<String, Integer> cart = (Map<String, Integer>) session.getAttribute("cart");
-
-        response.setContentType("text/html");
-        PrintWriter out = response.getWriter();
-        out.println("<html>");
-        out.println("<head>");
-        out.println("<title>Cart Summary</title>");
-        out.println("</head>");
-        out.println("<body>");
-
-        out.println("<h1>Cart Summary</h1>");
-
-        if (cart == null || cart.isEmpty()) {
-            out.println("<p>Your cart is empty</p>");
-        } else {
-            out.println("<table border='1'>");
-            out.println("<tr><th>Item</th><th>Quantity</th></tr>");
-            for (Map.Entry<String, Integer> entry : cart.entrySet()) {
-                out.println("<tr><td>" + entry.getKey() + "</td><td>" + entry.getValue() + "</td></tr>");
-            }
-            out.println("</table>");
-        }
-
-        out.println("<a href='/shop'>Back to Shopping</a>");
-        out.println("</body>");
-        out.println("</html>");
-    }
-}
diff --git a/App/stockItem,java b/App/stockItem,java
deleted file mode 100644
index 7e84810..0000000
--- a/App/stockItem,java
+++ /dev/null
@@ -1,74 +0,0 @@
-public class StockItem {
-
-String itemID;
-String itemDesc;
-Double price;
-int quantity;
-int reOrderLevel;
-//declaring my instance variables
-
-
-public StockItem (String itemID, String itemDesc, Double price, int quantity, int reOrderLevel)
-{       
-        this.itemID = itemID;
-        this.itemDesc = itemDesc;
-        this.price = price;
-        this.quantity = quantity;
-        this.reOrderLevel = reOrderLevel;
-}
-//declaring a contructor with 5 parameters for my instance variables
-
-
-
-public String getitemID() {
-    return itemID;
-}
-
-public String getitemDesc() {
-    return itemDesc;
-}
-
-public Double getprice() {
-    return price;
-}
-
-public int getquantity() {
-    return quantity;
-}
-
-public int getreOrderLevel() {
-    return reOrderLevel;
-}
-
-//creating my getters for all instance variables
-
-
-public void setprice(Double price) {
-    this.price = price;
-}
-
-public void setquantity(int quantity) {
-    this.quantity = quantity;
-}
-
-public void setreOrderLevel(int reOrderLevel) {
-    this.reOrderLevel = reOrderLevel;
-}
-
-//creating my setters for 3 instance variables
-
-
-public String toString()
-{
-    return getClass().getName() + "itemID: " + itemID + "itemDesc: " + itemDesc + "price:     "
-            + price + "quantity: " + quantity + "reOrderLevel: " + reOrderLevel;
-}
-
-
-//public String format() {}
-
-
-
-
-
-}
diff --git a/App/web/FastLoad.jsp b/App/web/FastLoad.jsp
deleted file mode 100644
index 65319fc..0000000
--- a/App/web/FastLoad.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Lazy Loading Example</title>
-    <style>
-        .lazy {
-            display: block;
-            width: 100%;
-            height: auto;
-            min-height: 200px; 
-            background-color: #f0f0f0; 
-        }
-    </style>
-</head>
-<body>
-    
-    
-    <img class="lazy" data-src="placeholder.jpg" alt="Placeholder Image">
-
-   
-    <jsp:include page="lazyLoadImages.jsp"></jsp:include>
-
-    <script>
-        
-        document.addEventListener("DOMContentLoaded", function() {
-            var lazyImg = document.querySelectorAll('img.lazy');
-            var options = {
-                rootMargin: '0px 0px 51px 0px',
-                threshold: 0.1
-            };
-            var lazyLoad = function(entries, observer) {
-                entries.forEach(function(entry) {
-                    if (entry.isIntersecting) {
-                        var lazyImg = entry.target;
-                        lazyImg.src = lazyImage.getAttribute('data-src');
-                        lazyImg.classList.remove('lazy');
-                        observer.unobserve(lazyImg);
-                    }
-                });
-            };
-
-            });
-        });
-    </script>
-</body>
-</html>
diff --git a/App/web/SiteParts/admin logout.jsp b/App/web/SiteParts/admin logout.jsp
deleted file mode 100644
index f61715e..0000000
--- a/App/web/SiteParts/admin logout.jsp	
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ page import="javax.servlet.http.HttpSession" %>
-<%@ page import="java.io.IOException" %>
-<%@ page import="java.io.PrintWriter" %>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Admin Logout</title>
-</head>
-<body>
-    <% 
-        HttpSession session = request.getSession(false); // Retrieve the session without creating a new one if it doesn't exist
-
-        if (session != null) {
-            session.invalidate(); // Invalidate the session, effectively logging out the admin
-            response.sendRedirect("home.jsp"); // Redirect to home page
-        } else {
-            // If session doesn't exist, display a message
-            out.println("<p>Session does not exist. You are already logged out.</p>");
-            out.println("<a href=\"adminLogin.jsp\">Back to Admin Login</a>");
-        }
-    %>
-</body>
-</html>
diff --git a/App/web/SiteParts/order_date.jsp b/App/web/SiteParts/order_date.jsp
deleted file mode 100644
index 454f256..0000000
--- a/App/web/SiteParts/order_date.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-
-<html>
-    <body>
-        <h1>Order Date: <%= request.getAttribute("orderDate")%></h1>
-    </body>
-</html>
-
diff --git a/App/web/Sorting.jsp b/App/web/Sorting.jsp
deleted file mode 100644
index e072b96..0000000
--- a/App/web/Sorting.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-public class ProductServlet extends HttpServlet {
-    
-    // Sample product data (replace with your actual product data)
-    private List<Product> products = Arrays.asList(
-        new Product(1, "Product A", 100),
-        new Product(2, "Product B", 200),
-        new Product(3, "Product C", 150)
-    );
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
-        
-        // Retrieve the sort parameter from the request
-        String sortParam = request.getParameter("sort");
-        
-        // Sort the products based on the sort parameter
-        if ("name".equals(sortParam)) {
-            Collections.sort(products, Comparator.comparing(Product::getName));
-        } else if ("price".equals(sortParam)) {
-            Collections.sort(products, Comparator.comparing(Product::getPrice));
-        }
-        
-        // Set products as an attribute to be accessed in JSP
-        request.setAttribute("products", products);
-        
-        // Forward the request to the JSP page for rendering
-        RequestDispatcher dispatcher = request.getRequestDispatcher("/products.jsp");
-        dispatcher.forward(request, response);
-    }
-}
diff --git a/App/web/admin.jsp b/App/web/admin.jsp
index 25bb0af..76734eb 100644
--- a/App/web/admin.jsp
+++ b/App/web/admin.jsp
@@ -17,7 +17,7 @@
 
 
 <section class="container defalt-container-style d-flex justify-content-between align-items-center">
-    <h2 id="page_topic" class="m-0">Orders</h2>
+    <h3 id="page_topic" class="m-0">Orders</h3>
     <div class="d-flex justify-content-center align-items-center">
         <button id="button1" class="btn btn-primary mx-1 btn-sm">Orders</button>
         <button id="button2" class="btn btn-primary mx-1 btn-sm">Products</button>
@@ -36,128 +36,6 @@
     <jsp:include page="./SiteParts/admin_users.jsp" />
 </div>
 
-<section class="container defalt-container-style d-flex justify-content-between align-items-center">
-    <h3 id="page_topic" class="m-0">Orders</h3>
-    <div class="d-flex justify-content-center align-items-center">
-        <input id="searchInput" type="text" placeholder="Search...">
-        <button id="button1" class="btn btn-primary mx-1 btn-sm">Orders</button>
-        <button id="button2" class="btn btn-primary mx-1 btn-sm">Products</button>
-        <button id="button3" class="btn btn-primary mx-1 btn-sm">Users</button>
-    </div>
-</section>
-
-<section class="container defalt-container-style d-flex justify-content-between align-items-center">
-    <h3 id="page_topic" class="m-0">Orders</h3>
-    <div class="d-flex justify-content-center align-items-center">
-        <input id="searchInput" type="text" placeholder="Search...">
-        <button id="button1" class="btn btn-primary mx-1 btn-sm">Orders</button>
-        <button id="button2" class="btn btn-primary mx-1 btn-sm">Products</button>
-        <button id="button3" class="btn btn-primary mx-1 btn-sm">Users</button>
-    </div>
-</section>
-
-<script>
-    // Function to show Section 1 and hide Section 2
-    function showSection1() {
-        // your existing code here
-    }
-
-    // Function to show Section 2 and hide Section 1
-    function showSection2() {
-        // your existing code here
-    }
-
-    function showSection3() {
-        // your existing code here
-    }
-
-    // Add event listeners to the buttons
-    document.getElementById("button1").addEventListener("click", showSection1);
-    document.getElementById("button2").addEventListener("click", showSection2);
-    document.getElementById("button3").addEventListener("click", showSection3);
-
-    // Search functionality
-    document.getElementById("searchInput").addEventListener("input", function() {
-        let searchText = this.value.toLowerCase();
-        let currentPage = document.getElementById("page_topic").innerText.toLowerCase();
-        if (currentPage === "orders") {
-            searchOrders(searchText);
-        } else if (currentPage === "products") {
-            searchProducts(searchText);
-        } else if (currentPage === "users") {
-            searchUsers(searchText);
-        }
-    });
-    function connectOrders(searchText) {
-        // AddProductServlet connect any server-side logic to connect orders
-        // Update the display with connected results
-        document.getId("section1").style.dis = "block";
-        document.getId("section2").style.dis = "none";
-        document.getId("section3").style.dis = "none";
-    }
-    
-    function searchOrders(searchText) {
-        // AJAX call or any server-side logic to search orders
-        // Update the display with search results
-    }
-
-    function searchProducts(searchText) {
-        // AJAX call or any server-side logic to search products
-        // Update the display with search results
-    }
-
-    function searchUsers(searchText) {
-        // AJAX call or any server-side logic to search users
-        // Update the display with search results
-    }
-</script>
-
-<script>
-    // Function to show Section 1 and hide Section 2
-    function showSection1() {
-        // your existing code here
-    }
-    // Function to show Section 2 and hide Section 1
-    function showSection2() {
-        // your existing code here
-    }
-    function showSection3() {
-        // your existing code here
-    }
-    // Add event listeners to the buttons
-    document.getElementById("button1").addEventListener("click", showSection1);
-    document.getElementById("button2").addEventListener("click", showSection2);
-    document.getElementById("button3").addEventListener("click", showSection3);
-
-    // Search functionality
-    document.getElementById("searchInput").addEventListener("input", function() {
-        let searchText = this.value.toLowerCase();
-        let currentPage = document.getElementById("page_topic").innerText.toLowerCase();
-
-        if (currentPage === "orders") {
-            searchOrders(searchText);
-        } else if (currentPage === "products") {
-            searchProducts(searchText);
-        } else if (currentPage === "users") {
-            searchUsers(searchText);
-        }
-    });
-
-    function searchOrders(searchText) {
-        // AJAX call or any server-side logic to search orders
-        // Update the display with search results
-    }
-
-    function searchProducts(searchText) {
-        // AJAX call or any server-side logic to search products
-        // Update the display with search results
-    }
-
-    function searchUsers(searchText) {
-        // AJAX call or any server-side logic to search users
-        // Update the display with search results
-    }
-</script>
 
 <script>
     // Function to show Section 1 and hide Section 2
@@ -199,10 +77,11 @@
             pg_number = 3;
         }
     %>
+
     window.onload = function () {
         showSection<%=pg_number%>();
     };
 </script>
 
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/web/cart.jsp b/App/web/cart.jsp
index 9ccf27a..ff14911 100644
--- a/App/web/cart.jsp
+++ b/App/web/cart.jsp
@@ -40,6 +40,7 @@
     float final_price = 0;
 %>
 
+
 <div class="container mt-5">
     <div class="row">
         <div class="col-lg-8">
@@ -142,27 +143,6 @@
         </div>
     </div>
 </div>
-<script>
-function changeAmount(itemId, action) {
-    var quantityField = document.getElementById("quantity_in_" + itemId);
-    var quantity = parseInt(quantityField.value);
 
-    if (isNaN(quantity) || quantity <= 0) {
-        alert("Please enter a valid quantity.");
-        return;
-    }
 
-    if (action === 'inc') {
-        quantity++;
-    } else if (action === 'dec' && quantity > 1) {
-        quantity--;
-    } else {
-        alert("Invalid action.");
-        return;
-    }
-    quantityField.value = quantity;
-    // Update the quantity display in the table.
-    var quantityDisplay = document.getElementById("quantity_" + itemId);
-    quantityDisplay.textContent = quantity;
-}
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/web/contact-us.jsp b/App/web/contact-us.jsp
index e2c6e4f..92543cf 100644
--- a/App/web/contact-us.jsp
+++ b/App/web/contact-us.jsp
@@ -13,6 +13,7 @@
 <jsp:include page="./SiteParts/jambo.jsp" />   
 
 
+
 <section class="defalt-container-style container contact-section">
     <div class="contact-left">
         <h3 class="mb-4">Write Us</h3>
@@ -47,4 +48,4 @@
 </section>
 
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/web/discount.jsp b/App/web/discount.jsp
deleted file mode 100644
index 9a7879c..0000000
--- a/App/web/discount.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Add Discount</title>
-</head>
-<body>
-    <h1>--Add Discount--</h1>
-    <form action="applyDiscount.jsp" method="post">
-        Product ID: <input type="text" name="productId"><br>
-        Discount Percentage: <input type="text" name="discountPercentage"><br>
-        <input type="submit" value="Apply Discount">
-        <input type="reset" value="cancel">
-    </form>
-</body>
-</html>
diff --git a/App/web/index.jsp b/App/web/index.jsp
index b2a7bcc..699208d 100644
--- a/App/web/index.jsp
+++ b/App/web/index.jsp
@@ -24,7 +24,7 @@
                 <%=((HashMap) session.getAttribute("user")).get("first_name")%>
                 <%
                 } else { %>
-                Welcome..
+                Welcome...
                 <% }%>
             </h1>
             <p>This is the best place to buy hand watches!</p>
@@ -33,6 +33,7 @@
     </div>
 </section>
 
+
 <section class=" text-white p-0 container defalt-container-style">
     <div class="title_info text-center mb-5 mt-5">
         <h1 class="m-0">We Consider,</h1>
@@ -41,7 +42,7 @@
     <table class="table-sec">
         <tr class="tr-index">
             <td class="table-div image-container">
-                <img class="brand-img" src="img/3.jpg" alt="Rolex" width="100%">
+                <img class="brand-img" src="img/3.jpg" alt="" width="100%">
             </td>
             <td class="table-div text-table-div p-3">
                 <h3>Quality</h3>
@@ -104,4 +105,6 @@
     </div>
 </section>
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+
+
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/web/orders.jsp b/App/web/orders.jsp
index a8fa090..a8b6c67 100644
--- a/App/web/orders.jsp
+++ b/App/web/orders.jsp
@@ -16,7 +16,7 @@
     request.setAttribute("description", "You can see all the products that you ordered.");
 %>
 <jsp:include page="./SiteParts/dash_header.jsp" />
-<jsp:include page="./SiteParts/alerts.jsp" />    
+<jsp:include page="./SiteParts/alerts.jsp" />   
 
 <jsp:include page="./SiteParts/submenubar.jsp" />
 
@@ -172,4 +172,4 @@
 <!--MODEL-->
 
 
-<jsp:include page="./SiteParts/dash_footer.jsp" />   
+<jsp:include page="./SiteParts/dash_footer.jsp" />   
\ No newline at end of file
diff --git a/App/web/pagination.jsp b/App/web/pagination.jsp
deleted file mode 100644
index 1c46db7..0000000
--- a/App/web/pagination.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ page import="java.util.List, java.util.ArrayList" %>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Products Page</title>
-</head>
-<body>
-    <h1>Products</h1>
-    
-    <% List<String> productList = new ArrayList<>(); %>
-    <% for (int i = 1; i <= 50; i++) {
-        productList.add("Product " + i);
-    } %>
-    
-    <%-- Pagination parameters --%>
-    <% int pageSize = 10; %>
-    <% int page = (request.getParameter("page") != null) ? Integer.parseInt(request.getParameter("page")) : 1; %>
-    <% int totalPages = (int) Math.ceil((double) productList.size() / pageSize); %>
-    <% int start = (page - 1) * pageSize; %>
-    <% int end = Math.min(start + pageSize, productList.size()); %>
-    
-    <%-- Display products for the current page --%>
-    <ul>
-        <% for (int i = start; i < end; i++) { %>
-            <li><%= productList.get(i) %></li>
-        <% } %>
-    </ul>
-    
-    <%-- Pagination links --%>
-    <% if (totalPages > 1) { %>
-        <div>
-            <% if (page > 1) { %>
-                <a href="products.jsp?page=<%= page - 1 %>">Previous</a>
-            <% } %>
-            
-            <% for (int i = 1; i <= totalPages; i++) { %>
-                <% if (i == page) { %>
-                    <%= i %>
-                <% } else { %>
-                    <a href="products.jsp?page=<%= i %>"><%= i %></a>
-                <% } %>
-            <% } %>
-            
-            <% if (page < totalPages) { %>
-                <a href="products.jsp?page=<%= page + 1 %>">Next</a>
-            <% } %>
-        </div>
-    <% } %>
-</body>
-</html>
diff --git a/App/web/productDetailsPage.jsp b/App/web/productDetailsPage.jsp
deleted file mode 100644
index 7125b16..0000000
--- a/App/web/productDetailsPage.jsp
+++ /dev/null
@@ -1,17 +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>
-<head>
-    <meta charset="UTF-8">
-    <title>Product Details</title>
-</head>
-<body>
-    <h1>${product.name}</h1>
-    <p>${product.description}</p>
-    <form action="addToWishlist" method="post">
-        <input type="hidden" name="productId" value="${product.id}">
-        <input type="submit" value="Add to Wishlist">
-    </form>
-</body>
-</html>