diff --git a/lab4-5/.gradle/8.5/executionHistory/executionHistory.bin b/lab4-5/.gradle/8.5/executionHistory/executionHistory.bin
index 323e033..991c1b9 100644
Binary files a/lab4-5/.gradle/8.5/executionHistory/executionHistory.bin and b/lab4-5/.gradle/8.5/executionHistory/executionHistory.bin differ
diff --git a/lab4-5/.gradle/8.5/executionHistory/executionHistory.lock b/lab4-5/.gradle/8.5/executionHistory/executionHistory.lock
index c809c1c..54c814e 100644
Binary files a/lab4-5/.gradle/8.5/executionHistory/executionHistory.lock and b/lab4-5/.gradle/8.5/executionHistory/executionHistory.lock differ
diff --git a/lab4-5/.gradle/8.5/fileHashes/fileHashes.bin b/lab4-5/.gradle/8.5/fileHashes/fileHashes.bin
index c12c0a0..651c7c8 100644
Binary files a/lab4-5/.gradle/8.5/fileHashes/fileHashes.bin and b/lab4-5/.gradle/8.5/fileHashes/fileHashes.bin differ
diff --git a/lab4-5/.gradle/8.5/fileHashes/fileHashes.lock b/lab4-5/.gradle/8.5/fileHashes/fileHashes.lock
index 3ef077b..396d62e 100644
Binary files a/lab4-5/.gradle/8.5/fileHashes/fileHashes.lock and b/lab4-5/.gradle/8.5/fileHashes/fileHashes.lock differ
diff --git a/lab4-5/.gradle/8.5/fileHashes/resourceHashesCache.bin b/lab4-5/.gradle/8.5/fileHashes/resourceHashesCache.bin
index 12581cd..5df11a7 100644
Binary files a/lab4-5/.gradle/8.5/fileHashes/resourceHashesCache.bin and b/lab4-5/.gradle/8.5/fileHashes/resourceHashesCache.bin differ
diff --git a/lab4-5/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/lab4-5/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9303cf0..fbc89b6 100644
Binary files a/lab4-5/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/lab4-5/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/lab4-5/build/classes/java/main/com/example/demo/products/api/ProductController.class b/lab4-5/build/classes/java/main/com/example/demo/products/api/ProductController.class
index 76486d4..c0ebe61 100644
Binary files a/lab4-5/build/classes/java/main/com/example/demo/products/api/ProductController.class and b/lab4-5/build/classes/java/main/com/example/demo/products/api/ProductController.class differ
diff --git a/lab4-5/build/resources/main/templates/default.html b/lab4-5/build/resources/main/templates/default.html
index 4f42e71..25350f5 100644
--- a/lab4-5/build/resources/main/templates/default.html
+++ b/lab4-5/build/resources/main/templates/default.html
@@ -28,8 +28,8 @@
                 </button>
                 <div class="collapse navbar-collapse" id="main-navbar">
                     <ul class="navbar-nav me-auto link" th:with="activeLink=${#objects.nullSafe(servletPath, '')}">
-                        <a class="nav-link my-a" href="/profile"
-                            th:classappend="${activeLink.startsWith('/profile') ? 'active' : ''}">
+                        <a class="nav-link my-a" href="/orders"
+                            th:classappend="${activeLink.startsWith('/orders') ? 'active' : ''}">
                             Личный кабинет
                         </a>
                         <th:block sec:authorize="hasRole('ADMIN')">
diff --git a/lab4-5/build/resources/main/templates/index.html b/lab4-5/build/resources/main/templates/index.html
index 0b7d878..43f16c7 100644
--- a/lab4-5/build/resources/main/templates/index.html
+++ b/lab4-5/build/resources/main/templates/index.html
@@ -24,11 +24,7 @@
                   <button type="submit" class="btn btn-secondary ms-2">Показать</button>
                 </form>
 
-                <form class="search-form" th:action="@{/}" method="get" style="display: flex;">
-                  <input type="text" th:name="query" th:value="${query}" placeholder="Введите название" />
-                  <button class="btn btn-secondary ms-2" type="submit">Поиск</button>
-                </form>
-
+                
               </div>
               <div class="mt-4" style="display: grid; grid-template-columns: repeat(4, 1fr); gap: 20px">
                 <div class="card" style="margin-bottom: 1rem" th:each="product : ${items}">
@@ -64,4 +60,22 @@
       </main>
 </body>
 
-</html>
\ No newline at end of file
+</html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- <form class="search-form" th:action="@{/}" method="get" style="display: flex;">
+                  <input type="text" th:name="query" th:value="${query}" placeholder="Введите название" />
+                  <button class="btn btn-secondary ms-2" type="submit">Поиск</button>
+                </form> -->
\ No newline at end of file
diff --git a/lab4-5/build/resources/main/templates/order-details.html b/lab4-5/build/resources/main/templates/order-details.html
index e48449b..21995d5 100644
--- a/lab4-5/build/resources/main/templates/order-details.html
+++ b/lab4-5/build/resources/main/templates/order-details.html
@@ -3,39 +3,41 @@
 
 <body>
     <main layout:fragment="content">
-        <h1>Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]</h1>
-        <th:block th:switch="${items.size()}">
-            <h2 th:case="0">Товары заказа отсутствуют</h2>
-            <th:block th:case="*">
-                <table class="table mt-2">
-                    <caption></caption>
-                    <thead>
-                        <tr>
-                            <th scope="col" class="w-auto">Название товара</th>
-                            <th scope="col" class="w-auto">Цвет</th>
-                            <th scope="col" class="w-auto">Размер</th>
-                            <th scope="col" class="w-10">Цена</th>
-                            <th scope="col" class="w-10">Количество</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr th:each="item : ${items}">
-                            <td th:text="${item.productName}"></td>
-                            <td th:text="${item.productColor}"></td>
-                            <td th:text="${item.productSize}"></td>
-                            <td th:text="${#numbers.formatDecimal(item.productPrice, 1, 2)}"></td>
-                            <td th:text="${item.count}"></td>
-                        </tr>
-                    </tbody>
-                </table>
+        <div class="container">
+            <h1>Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]</h1>
+            <th:block th:switch="${items.size()}">
+                <h2 th:case="0">Товары заказа отсутствуют</h2>
+                <th:block th:case="*">
+                    <table class="table mt-2">
+                        <caption></caption>
+                        <thead>
+                            <tr>
+                                <th scope="col" class="w-auto">Название товара</th>
+                                <th scope="col" class="w-auto">Цвет</th>
+                                <th scope="col" class="w-auto">Размер</th>
+                                <th scope="col" class="w-10">Цена</th>
+                                <th scope="col" class="w-10">Количество</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr th:each="item : ${items}">
+                                <td th:text="${item.productName}"></td>
+                                <td th:text="${item.productColor}"></td>
+                                <td th:text="${item.productSize}"></td>
+                                <td th:text="${#numbers.formatDecimal(item.productPrice, 1, 2)}"></td>
+                                <td th:text="${item.count}"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </th:block>
+                <th:block th:replace="~{ pagination :: pagination (
+                                                    url='',
+                                                    totalPages=${totalPages},
+                                                    currentPage=${currentPage}) }" />
+            <h2>Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб</h2>
+            <button class="btn btn-secondary" onclick="history.back()">Назад</button>
             </th:block>
-            <th:block th:replace="~{ pagination :: pagination (
-                                                url='',
-                                                totalPages=${totalPages},
-                                                currentPage=${currentPage}) }" />
-        <h2>Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб</h2>
-        <button class="btn btn-secondary" onclick="history.back()">Назад</button>
-        </th:block>
+        </div>
     </main>
 </body>
 
diff --git a/lab4-5/build/resources/main/templates/orders.html b/lab4-5/build/resources/main/templates/orders.html
index 3ffe78b..669d042 100644
--- a/lab4-5/build/resources/main/templates/orders.html
+++ b/lab4-5/build/resources/main/templates/orders.html
@@ -3,42 +3,44 @@
 
 <body>
     <main layout:fragment="content">
-
-        <th:block th:fragment="orders (items, totalPages, currentPage)">
-            <th:block th:switch="${items.size()}">
-                <h2 th:case="0">Данные отсутствуют</h2>
-                <th:block th:case="*">
-                    <table class="table mt-2">
-                        <caption></caption>
-                        <thead>
-                            <tr>
-                                <th scope="col" class="w-10">ID</th>
-                                <th scope="col" class="w-10">Дата</th>
-                                <th scope="col" class="w-10"></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr th:each="order : ${items}">
-                                <th scope="row" th:text="${order.id}"></th>
-                                <td th:text="${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}"></td>
-                                <td>
-                                    <form th:action="@{/orders/details/{id}(id=${order.id})}" method="get">
-                                        <button type="submit" class="btn btn-link button-link">Детали</button>
-                                    </form>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
+        <div class="container">
+            <h2>Личный кабинет</h2>
+            <th:block th:fragment="orders (items, totalPages, currentPage)">
+                <th:block th:switch="${items.size()}">
+                    <h2 th:case="0">Данные отсутствуют</h2>
+                    <th:block th:case="*">
+                        <table class="table mt-2">
+                            <caption></caption>
+                            <thead>
+                                <tr>
+                                    <th scope="col" class="w-10">ID</th>
+                                    <th scope="col" class="w-10">Дата</th>
+                                    <th scope="col" class="w-10"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr th:each="order : ${items}">
+                                    <th scope="row" th:text="${order.id}"></th>
+                                    <td th:text="${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}"></td>
+                                    <td>
+                                        <form th:action="@{/orders/details/{id}(id=${order.id})}" method="get">
+                                            <button type="submit" class="btn btn-link button-link">Детали</button>
+                                        </form>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </th:block>
+                    <th:block th:replace="~{ pagination :: pagination (
+                                                url='',
+                                                totalPages=${totalPages},
+                                                currentPage=${currentPage}) }" />
+                    <div class="mt-2 d-flex justify-content-center">
+                        <a class="btn btn-secondary" href="/cart">Создать заказ</a>
+                    </div>
                 </th:block>
-                <th:block th:replace="~{ pagination :: pagination (
-                                            url='',
-                                            totalPages=${totalPages},
-                                            currentPage=${currentPage}) }" />
-                <div class="mt-2 d-flex justify-content-center">
-                    <a class="btn btn-secondary" href="/cart">Создать заказ</a>
-                </div>
             </th:block>
-        </th:block>
+        </div>
     </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/lab4-5/build/resources/main/templates/product.html b/lab4-5/build/resources/main/templates/product.html
index 3767bc1..b296f9b 100644
--- a/lab4-5/build/resources/main/templates/product.html
+++ b/lab4-5/build/resources/main/templates/product.html
@@ -11,20 +11,8 @@
       <h2 th:case="0">Данные отсутствуют</h2>
         <th:block th:case="*">
           <div class = "container">
-
             <h2>Товары</h2>
-  
-            <ul class="nav nav-underline justify-content-center" role="tablist">
-              <li class="nav-item">
-                  <a class="nav-link active" data-bs-toggle="pill" href="#products">Позиции</a>
-              </li>
-              <li class="nav-item">
-                  <a class="nav-link" data-bs-toggle="pill" href="#stats">Статистика</a>
-              </li>
-            </ul>
-  
-            <div class="tab-content mt-2">
-                <div class="tab-pane container active" id="products">
+            
                   <div class="d-flex align-items-center justify-content-between">
                     <a href="/admin/product/edit/" class="btn btn-secondary">Добавить товар</a>
                     <form class="search-form" th:action="@{/admin/product}" method="get" style="display: flex;">
@@ -74,14 +62,9 @@
                     currentPage=${currentPage}) }" />
                   </th:block>
                 </div>
-                <div class="tab-pane container fade" id="stats">
-                    <ul class="list-group mb-2">
-                        <li th:each="stat : ${stats}" class="list-group-item">
-                            <strong>[[${stat.typeId}]]</strong>:
-                            [[${#numbers.formatDecimal(stat.totalPrice, 1, 2)}]] &#8381;
-                        </li>
-                    </ul>
-                </div>
+                <!-- <div class="tab-pane container fade" id="stats">
+                    
+                </div> -->
             </div>
           </div>
       </th:block>
@@ -89,4 +72,36 @@
   </main>
 </body>
 
-</html>
\ No newline at end of file
+</html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- <ul class="nav nav-underline justify-content-center" role="tablist">
+              <li class="nav-item">
+                  <a class="nav-link active" data-bs-toggle="pill" href="#products">Позиции</a>
+              </li>
+              <li class="nav-item">
+                  <a class="nav-link" data-bs-toggle="pill" href="#stats">Статистика</a>
+              </li>
+            </ul>
+  
+            <div class="tab-content mt-2">
+                <div class="tab-pane container active" id="products"> -->
\ No newline at end of file
diff --git a/lab4-5/build/resources/main/templates/profile.html b/lab4-5/build/resources/main/templates/profile.html
index 157f1e3..34cc51b 100644
--- a/lab4-5/build/resources/main/templates/profile.html
+++ b/lab4-5/build/resources/main/templates/profile.html
@@ -8,7 +8,7 @@
 <body>
     <main layout:fragment="content">
             <h2>Личный кабинет</h2>
-            <ul class="nav nav-underline justify-content-center" role="tablist">
+            <!-- <ul class="nav nav-underline justify-content-center" role="tablist">
                 <li class="nav-item">
                     <a class="nav-link active" data-bs-toggle="pill" href="#orders">Заказы</a>
                 </li>
@@ -33,7 +33,7 @@
                     </ul>
                 </div>
                 
-            </div>
+            </div> -->
     </main>
 </body>
 
diff --git a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/CartItemController.class.uniqueId0 b/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/CartItemController.class.uniqueId0
deleted file mode 100644
index 708fb82..0000000
Binary files a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/CartItemController.class.uniqueId0 and /dev/null differ
diff --git a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderController.class.uniqueId1 b/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderController.class.uniqueId1
deleted file mode 100644
index ea71a5e..0000000
Binary files a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderController.class.uniqueId1 and /dev/null differ
diff --git a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderService.class.uniqueId2 b/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderService.class.uniqueId2
deleted file mode 100644
index 182b63d..0000000
Binary files a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderService.class.uniqueId2 and /dev/null differ
diff --git a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/ProductController.class.uniqueId0 b/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/ProductController.class.uniqueId0
new file mode 100644
index 0000000..76486d4
Binary files /dev/null and b/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/ProductController.class.uniqueId0 differ
diff --git a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/UserProfileController.class.uniqueId3 b/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/UserProfileController.class.uniqueId3
deleted file mode 100644
index 17c45d6..0000000
Binary files a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/UserProfileController.class.uniqueId3 and /dev/null differ
diff --git a/lab4-5/build/tmp/compileJava/previous-compilation-data.bin b/lab4-5/build/tmp/compileJava/previous-compilation-data.bin
index 8fc1f51..d08f74a 100644
Binary files a/lab4-5/build/tmp/compileJava/previous-compilation-data.bin and b/lab4-5/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/lab4-5/data.mv.db b/lab4-5/data.mv.db
index 6c7b74d..a100306 100644
Binary files a/lab4-5/data.mv.db and b/lab4-5/data.mv.db differ
diff --git a/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java b/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java
index 4582a6d..741a88e 100644
--- a/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java
+++ b/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java
@@ -110,10 +110,6 @@ public class ProductController {
     @GetMapping("/edit/")
     public String create(Model model) {
         model.addAttribute(PRODUCT_ATTRIBUTE, new ProductDto());
-        /*model.addAttribute("stats",
-                productService.getTotal().stream()
-                        .map(this::toGroupedDto)
-                        .toList()); */
         model.addAttribute("types",
                 typeService.getAll().stream()
                         .map(this::toTypeDto)
@@ -139,10 +135,6 @@ public class ProductController {
         if (id <= 0) {
             throw new IllegalArgumentException();
         }
-        /*model.addAttribute("stats",
-                productService.getTotal().stream()
-                        .map(this::toGroupedDto)
-                        .toList()); */
         model.addAttribute("types",
                 typeService.getAll().stream()
                         .map(this::toTypeDto)
diff --git a/lab4-5/src/main/resources/templates/default.html b/lab4-5/src/main/resources/templates/default.html
index 4f42e71..25350f5 100644
--- a/lab4-5/src/main/resources/templates/default.html
+++ b/lab4-5/src/main/resources/templates/default.html
@@ -28,8 +28,8 @@
                 </button>
                 <div class="collapse navbar-collapse" id="main-navbar">
                     <ul class="navbar-nav me-auto link" th:with="activeLink=${#objects.nullSafe(servletPath, '')}">
-                        <a class="nav-link my-a" href="/profile"
-                            th:classappend="${activeLink.startsWith('/profile') ? 'active' : ''}">
+                        <a class="nav-link my-a" href="/orders"
+                            th:classappend="${activeLink.startsWith('/orders') ? 'active' : ''}">
                             Личный кабинет
                         </a>
                         <th:block sec:authorize="hasRole('ADMIN')">
diff --git a/lab4-5/src/main/resources/templates/index.html b/lab4-5/src/main/resources/templates/index.html
index 0b7d878..43f16c7 100644
--- a/lab4-5/src/main/resources/templates/index.html
+++ b/lab4-5/src/main/resources/templates/index.html
@@ -24,11 +24,7 @@
                   <button type="submit" class="btn btn-secondary ms-2">Показать</button>
                 </form>
 
-                <form class="search-form" th:action="@{/}" method="get" style="display: flex;">
-                  <input type="text" th:name="query" th:value="${query}" placeholder="Введите название" />
-                  <button class="btn btn-secondary ms-2" type="submit">Поиск</button>
-                </form>
-
+                
               </div>
               <div class="mt-4" style="display: grid; grid-template-columns: repeat(4, 1fr); gap: 20px">
                 <div class="card" style="margin-bottom: 1rem" th:each="product : ${items}">
@@ -64,4 +60,22 @@
       </main>
 </body>
 
-</html>
\ No newline at end of file
+</html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- <form class="search-form" th:action="@{/}" method="get" style="display: flex;">
+                  <input type="text" th:name="query" th:value="${query}" placeholder="Введите название" />
+                  <button class="btn btn-secondary ms-2" type="submit">Поиск</button>
+                </form> -->
\ No newline at end of file
diff --git a/lab4-5/src/main/resources/templates/order-details.html b/lab4-5/src/main/resources/templates/order-details.html
index e48449b..21995d5 100644
--- a/lab4-5/src/main/resources/templates/order-details.html
+++ b/lab4-5/src/main/resources/templates/order-details.html
@@ -3,39 +3,41 @@
 
 <body>
     <main layout:fragment="content">
-        <h1>Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]</h1>
-        <th:block th:switch="${items.size()}">
-            <h2 th:case="0">Товары заказа отсутствуют</h2>
-            <th:block th:case="*">
-                <table class="table mt-2">
-                    <caption></caption>
-                    <thead>
-                        <tr>
-                            <th scope="col" class="w-auto">Название товара</th>
-                            <th scope="col" class="w-auto">Цвет</th>
-                            <th scope="col" class="w-auto">Размер</th>
-                            <th scope="col" class="w-10">Цена</th>
-                            <th scope="col" class="w-10">Количество</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr th:each="item : ${items}">
-                            <td th:text="${item.productName}"></td>
-                            <td th:text="${item.productColor}"></td>
-                            <td th:text="${item.productSize}"></td>
-                            <td th:text="${#numbers.formatDecimal(item.productPrice, 1, 2)}"></td>
-                            <td th:text="${item.count}"></td>
-                        </tr>
-                    </tbody>
-                </table>
+        <div class="container">
+            <h1>Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]</h1>
+            <th:block th:switch="${items.size()}">
+                <h2 th:case="0">Товары заказа отсутствуют</h2>
+                <th:block th:case="*">
+                    <table class="table mt-2">
+                        <caption></caption>
+                        <thead>
+                            <tr>
+                                <th scope="col" class="w-auto">Название товара</th>
+                                <th scope="col" class="w-auto">Цвет</th>
+                                <th scope="col" class="w-auto">Размер</th>
+                                <th scope="col" class="w-10">Цена</th>
+                                <th scope="col" class="w-10">Количество</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr th:each="item : ${items}">
+                                <td th:text="${item.productName}"></td>
+                                <td th:text="${item.productColor}"></td>
+                                <td th:text="${item.productSize}"></td>
+                                <td th:text="${#numbers.formatDecimal(item.productPrice, 1, 2)}"></td>
+                                <td th:text="${item.count}"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </th:block>
+                <th:block th:replace="~{ pagination :: pagination (
+                                                    url='',
+                                                    totalPages=${totalPages},
+                                                    currentPage=${currentPage}) }" />
+            <h2>Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб</h2>
+            <button class="btn btn-secondary" onclick="history.back()">Назад</button>
             </th:block>
-            <th:block th:replace="~{ pagination :: pagination (
-                                                url='',
-                                                totalPages=${totalPages},
-                                                currentPage=${currentPage}) }" />
-        <h2>Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб</h2>
-        <button class="btn btn-secondary" onclick="history.back()">Назад</button>
-        </th:block>
+        </div>
     </main>
 </body>
 
diff --git a/lab4-5/src/main/resources/templates/orders.html b/lab4-5/src/main/resources/templates/orders.html
index 3ffe78b..669d042 100644
--- a/lab4-5/src/main/resources/templates/orders.html
+++ b/lab4-5/src/main/resources/templates/orders.html
@@ -3,42 +3,44 @@
 
 <body>
     <main layout:fragment="content">
-
-        <th:block th:fragment="orders (items, totalPages, currentPage)">
-            <th:block th:switch="${items.size()}">
-                <h2 th:case="0">Данные отсутствуют</h2>
-                <th:block th:case="*">
-                    <table class="table mt-2">
-                        <caption></caption>
-                        <thead>
-                            <tr>
-                                <th scope="col" class="w-10">ID</th>
-                                <th scope="col" class="w-10">Дата</th>
-                                <th scope="col" class="w-10"></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr th:each="order : ${items}">
-                                <th scope="row" th:text="${order.id}"></th>
-                                <td th:text="${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}"></td>
-                                <td>
-                                    <form th:action="@{/orders/details/{id}(id=${order.id})}" method="get">
-                                        <button type="submit" class="btn btn-link button-link">Детали</button>
-                                    </form>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
+        <div class="container">
+            <h2>Личный кабинет</h2>
+            <th:block th:fragment="orders (items, totalPages, currentPage)">
+                <th:block th:switch="${items.size()}">
+                    <h2 th:case="0">Данные отсутствуют</h2>
+                    <th:block th:case="*">
+                        <table class="table mt-2">
+                            <caption></caption>
+                            <thead>
+                                <tr>
+                                    <th scope="col" class="w-10">ID</th>
+                                    <th scope="col" class="w-10">Дата</th>
+                                    <th scope="col" class="w-10"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr th:each="order : ${items}">
+                                    <th scope="row" th:text="${order.id}"></th>
+                                    <td th:text="${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}"></td>
+                                    <td>
+                                        <form th:action="@{/orders/details/{id}(id=${order.id})}" method="get">
+                                            <button type="submit" class="btn btn-link button-link">Детали</button>
+                                        </form>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </th:block>
+                    <th:block th:replace="~{ pagination :: pagination (
+                                                url='',
+                                                totalPages=${totalPages},
+                                                currentPage=${currentPage}) }" />
+                    <div class="mt-2 d-flex justify-content-center">
+                        <a class="btn btn-secondary" href="/cart">Создать заказ</a>
+                    </div>
                 </th:block>
-                <th:block th:replace="~{ pagination :: pagination (
-                                            url='',
-                                            totalPages=${totalPages},
-                                            currentPage=${currentPage}) }" />
-                <div class="mt-2 d-flex justify-content-center">
-                    <a class="btn btn-secondary" href="/cart">Создать заказ</a>
-                </div>
             </th:block>
-        </th:block>
+        </div>
     </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/lab4-5/src/main/resources/templates/product.html b/lab4-5/src/main/resources/templates/product.html
index 3767bc1..b296f9b 100644
--- a/lab4-5/src/main/resources/templates/product.html
+++ b/lab4-5/src/main/resources/templates/product.html
@@ -11,20 +11,8 @@
       <h2 th:case="0">Данные отсутствуют</h2>
         <th:block th:case="*">
           <div class = "container">
-
             <h2>Товары</h2>
-  
-            <ul class="nav nav-underline justify-content-center" role="tablist">
-              <li class="nav-item">
-                  <a class="nav-link active" data-bs-toggle="pill" href="#products">Позиции</a>
-              </li>
-              <li class="nav-item">
-                  <a class="nav-link" data-bs-toggle="pill" href="#stats">Статистика</a>
-              </li>
-            </ul>
-  
-            <div class="tab-content mt-2">
-                <div class="tab-pane container active" id="products">
+            
                   <div class="d-flex align-items-center justify-content-between">
                     <a href="/admin/product/edit/" class="btn btn-secondary">Добавить товар</a>
                     <form class="search-form" th:action="@{/admin/product}" method="get" style="display: flex;">
@@ -74,14 +62,9 @@
                     currentPage=${currentPage}) }" />
                   </th:block>
                 </div>
-                <div class="tab-pane container fade" id="stats">
-                    <ul class="list-group mb-2">
-                        <li th:each="stat : ${stats}" class="list-group-item">
-                            <strong>[[${stat.typeId}]]</strong>:
-                            [[${#numbers.formatDecimal(stat.totalPrice, 1, 2)}]] &#8381;
-                        </li>
-                    </ul>
-                </div>
+                <!-- <div class="tab-pane container fade" id="stats">
+                    
+                </div> -->
             </div>
           </div>
       </th:block>
@@ -89,4 +72,36 @@
   </main>
 </body>
 
-</html>
\ No newline at end of file
+</html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- <ul class="nav nav-underline justify-content-center" role="tablist">
+              <li class="nav-item">
+                  <a class="nav-link active" data-bs-toggle="pill" href="#products">Позиции</a>
+              </li>
+              <li class="nav-item">
+                  <a class="nav-link" data-bs-toggle="pill" href="#stats">Статистика</a>
+              </li>
+            </ul>
+  
+            <div class="tab-content mt-2">
+                <div class="tab-pane container active" id="products"> -->
\ No newline at end of file
diff --git a/lab4-5/src/main/resources/templates/profile.html b/lab4-5/src/main/resources/templates/profile.html
index 157f1e3..34cc51b 100644
--- a/lab4-5/src/main/resources/templates/profile.html
+++ b/lab4-5/src/main/resources/templates/profile.html
@@ -8,7 +8,7 @@
 <body>
     <main layout:fragment="content">
             <h2>Личный кабинет</h2>
-            <ul class="nav nav-underline justify-content-center" role="tablist">
+            <!-- <ul class="nav nav-underline justify-content-center" role="tablist">
                 <li class="nav-item">
                     <a class="nav-link active" data-bs-toggle="pill" href="#orders">Заказы</a>
                 </li>
@@ -33,7 +33,7 @@
                     </ul>
                 </div>
                 
-            </div>
+            </div> -->
     </main>
 </body>