fix folder common

hardingadonis · Jan 22, 2024 · f0cc3b4 · f0cc3b4
1 parent 617c655
commit f0cc3b4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -4,9 +4,17 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
          version="6.0">
+
     <session-config>
         <session-timeout>
             30
         </session-timeout>
     </session-config>
+
+	<jsp-config>
+        <jsp-property-group>
+            <url-pattern>*.jsp</url-pattern>
+            <page-encoding>UTF-8</page-encoding>
+        </jsp-property-group>
+    </jsp-config>
 </web-app>
diff --git a/src/main/webapp/view/assets/js/chart.min.js b/src/main/webapp/view/assets/js/chart.min.js
diff --git a/src/main/webapp/view/common/_footer.jsp b/src/main/webapp/view/common/_footer.jsp
@@ -1,7 +1,7 @@
 <footer class="bg-white sticky-footer">
     <div class="container my-auto">
         <div class="text-center my-auto copyright">
-            <h6>Copyright © Sale Dock 2024</h6>
+            <h6>Copyright @ Sale Dock 2024</h6>
 
             <a href="https://github.com/hardingadonis/saledock" target="_blank">
                 <img class="img-fluid" src="https://contrib.rocks/image?repo=hardingadonis/saledock" style="transform: scale(0.70);">

diff --git a/src/main/webapp/view/common/_nav.jsp b/src/main/webapp/view/common/_nav.jsp
@@ -9,13 +9,13 @@
                 <div class="nav-item dropdown no-arrow">
                     <a class="dropdown-toggle nav-link" aria-expanded="false" data-bs-toggle="dropdown" href="#">
                         <span class="d-none d-lg-inline me-2 text-gray-600 small">
-                            Group 1
+                            ${sessionScope.employee.fullName}
                         </span>
-                        <img class="border rounded-circle img-profile" src="assets/img/avatars/employee.png">
+                        <img class="border rounded-circle img-profile" src="<%=request.getContextPath()%>/assets/img/avatars/employee.png">
                     </a>
 
                     <div class="dropdown-menu shadow dropdown-menu-end animated--grow-in">
-                        <a class="dropdown-item" href="#">
+                        <a class="dropdown-item" href="<%=request.getContextPath()%>/logout">
                             <i class="fas fa-sign-out-alt fa-sm fa-fw me-2 text-gray-400"></i>&nbsp;Logout
                         </a>
                     </div>

diff --git a/src/main/webapp/view/common/_sidenav.jsp b/src/main/webapp/view/common/_sidenav.jsp
@@ -1,6 +1,6 @@
 <nav class="navbar align-items-start sidebar sidebar-dark accordion bg-gradient-primary p-0 navbar-dark">
     <div class="container-fluid d-flex flex-column p-0">
-        <a class="navbar-brand d-flex justify-content-center align-items-center sidebar-brand m-0" href="#">
+        <a class="navbar-brand d-flex justify-content-center align-items-center sidebar-brand m-0" href="<%=request.getContextPath()%>/dashboard">
             <div class="sidebar-brand-icon rotate-n-15">
                 <i class="la la-balance-scale"></i>
             </div>
@@ -13,29 +13,31 @@
 
         <ul class="navbar-nav text-light" id="accordionSidebar">
             <li class="nav-item">
-                <a class="nav-link" href="index.html">
+                <a class="nav-link" href="<%=request.getContextPath()%>/dashboard">
                     <i class="fas fa-tachometer-alt"></i>
-                    <span>B?ng ?i?u khi?n</span>
+                    <span>Bảng điều khiển</span>
                 </a>
             </li>
 
             <li class="nav-item">
-                <a class="nav-link" href="customer.html" title="Qu?n lý khách hàng">
+                <a class="nav-link" href="<%=request.getContextPath()%>/customer" title="Quản lí khách hàng">
                     <i class="fas fa-table"></i>
-                    <span>Khách hàng</span>
+                    <span data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="right" title="Quản lí sản phẩm">
+                        Khách hàng
+                    </span>
                 </a>
 
-                <a class="nav-link" href="product.html" title="Qu?n lí s?n ph?m">
+                <a class="nav-link" href="<%=request.getContextPath()%>/product" title="Quản lí sản phẩm">
                     <i class="fas fa-table"></i>
-                    <span data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="right" title="Qu?n lí s?n ph?m">
-                        S?n ph?m
+                    <span data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="right" title="Quản lí sản phẩm">
+                        Sản phẩm
                     </span>
                 </a>
 
-                <a class="nav-link" href="order.html" title="Qu?n lí ??n hàng">
+                <a class="nav-link" href="<%=request.getContextPath()%>/order" title="Quản lí đơn hàng">
                     <i class="fas fa-table"></i>
-                    <span data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="right" title="Qu?n lí ??n hàng">
-                        ??n hàng
+                    <span data-bs-toggle="tooltip" data-bss-tooltip="" data-bs-placement="right" title="Quản lí đơn hàng">
+                        Đơn hàng
                     </span>
                 </a>
             </li>