From 7e50772f3f1d30d8f4158b81c874f9f9c5a2c98e Mon Sep 17 00:00:00 2001
From: nguyenvanbao <nguyenhoanggiaphong12@gmail.com>
Date: Wed, 4 Feb 2026 13:32:35 +0700
Subject: [PATCH] style: resolve merge conflicts and format admin routes

---
 routes/admin.js        | 63 +++++++++++++++++++++++++++++++++---------
 views/layouts/main.ejs |  3 +-
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/routes/admin.js b/routes/admin.js
index 9c2ecb8..60d74c1 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -385,8 +385,6 @@ router.post(
   ensureAuthenticated,
   insuranceController.update,
 );
-<<<<<<< HEAD
-=======
 
 // Service routes
 router.get("/service", ensureAuthenticated, serviceController.index);
@@ -413,7 +411,6 @@ router.post(
   serviceController.updateDetails,
 );
 
->>>>>>> a255d09ef0a6eb0c487595aac19cefbf729d78a2
 // Test Image Paths route
 router.get("/test-images", ensureAuthenticated, (req, res) => {
   const fs = require("fs");
@@ -509,21 +506,61 @@ router.post("/blog/:id/edit", ensureAuthenticated, blogController.update);
 router.post("/blog/:id/delete", ensureAuthenticated, blogController.destroy);
 
 // Blog Categories Management
-router.get("/blog/categories", ensureAuthenticated, blogCategoryController.index);
-router.get("/blog/categories/create", ensureAuthenticated, blogCategoryController.create);
-router.post("/blog/categories/create", ensureAuthenticated, blogCategoryController.store);
-router.get("/blog/categories/:id/edit", ensureAuthenticated, blogCategoryController.edit);
-router.post("/blog/categories/:id/edit", ensureAuthenticated, blogCategoryController.update);
-router.post("/blog/categories/:id/delete", ensureAuthenticated, blogCategoryController.destroy);
-router.post("/blog/categories/quick-create", ensureAuthenticated, blogCategoryController.quickCreate);
+router.get(
+  "/blog/categories",
+  ensureAuthenticated,
+  blogCategoryController.index,
+);
+router.get(
+  "/blog/categories/create",
+  ensureAuthenticated,
+  blogCategoryController.create,
+);
+router.post(
+  "/blog/categories/create",
+  ensureAuthenticated,
+  blogCategoryController.store,
+);
+router.get(
+  "/blog/categories/:id/edit",
+  ensureAuthenticated,
+  blogCategoryController.edit,
+);
+router.post(
+  "/blog/categories/:id/edit",
+  ensureAuthenticated,
+  blogCategoryController.update,
+);
+router.post(
+  "/blog/categories/:id/delete",
+  ensureAuthenticated,
+  blogCategoryController.destroy,
+);
+router.post(
+  "/blog/categories/quick-create",
+  ensureAuthenticated,
+  blogCategoryController.quickCreate,
+);
 
 // Blog Tags Management
 router.get("/blog/tags", ensureAuthenticated, blogTagController.index);
 router.get("/blog/tags/create", ensureAuthenticated, blogTagController.create);
 router.post("/blog/tags/create", ensureAuthenticated, blogTagController.store);
 router.get("/blog/tags/:id/edit", ensureAuthenticated, blogTagController.edit);
-router.post("/blog/tags/:id/edit", ensureAuthenticated, blogTagController.update);
-router.post("/blog/tags/:id/delete", ensureAuthenticated, blogTagController.destroy);
-router.post("/blog/tags/quick-create", ensureAuthenticated, blogTagController.quickCreate);
+router.post(
+  "/blog/tags/:id/edit",
+  ensureAuthenticated,
+  blogTagController.update,
+);
+router.post(
+  "/blog/tags/:id/delete",
+  ensureAuthenticated,
+  blogTagController.destroy,
+);
+router.post(
+  "/blog/tags/quick-create",
+  ensureAuthenticated,
+  blogTagController.quickCreate,
+);
 
 module.exports = router;
diff --git a/views/layouts/main.ejs b/views/layouts/main.ejs
index 9409bb2..9192536 100644
--- a/views/layouts/main.ejs
+++ b/views/layouts/main.ejs
@@ -520,7 +520,6 @@
         font-weight: bold;
       }
 
-
       .hover-opacity:hover {
         opacity: 0.8;
         transition: opacity 0.3s ease;
@@ -857,7 +856,7 @@
       </div>
     </div>
   </footer>
-  <!-- Impport JS tại đây -->
+  <!-- Import JS tại đây -->
   <!-- Bootstrap JS -->
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>