minhnhat/cms.uldp.edu.vn
1
0
Fork 0
forked from UKSOURCE/cms.hailearning.edu.vn
Code Pull Requests Activity

style: resolve merge conflicts and format admin routes

Browse Source
This commit is contained in:
nguyenvanbao
2026-02-04 13:32:35 +07:00
parent 050f6b7776
commit 7e50772f3f
2 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
routes/admin.js
View File

@@ -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;

3
views/layouts/main.ejs
View File

@@ -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>