fix conflig pull request

This commit is contained in:
r2xrzh9q2z-lab
2026-02-04 09:26:50 +07:00
30 changed files with 6247 additions and 168 deletions

View File

@@ -19,6 +19,7 @@ const activityController = require("../controllers/activityController");
const travelController = require("../controllers/travelController");
const bookingSubmissionController = require("../controllers/bookingSubmissionController");
const serviceController = require("../controllers/serviceController");
// Blog controllers
const blogController = require("../controllers/blogController");
const blogCategoryController = require("../controllers/blogCategoryController");
@@ -167,20 +168,26 @@ router.get("/api/blog/tags/:slug", blogTagController.apiShow);
router.get("/api/blog/:id/categories", blogController.apiCategories);
router.get("/api/blog/:id/tags", blogController.apiTags);
// Blog comments (must come before /api/blog/:slug)
router.post("/api/blog/:slug/comments", blogController.apiCreateComment);
// Blog detail by slug (must come last among blog routes)
router.get("/api/blog/:slug", blogController.apiShow);
// // API route cho blog detail
// router.get('/api/blog-detail', blogDetailController.api);
// ==================== PUBLIC API ROUTES ====================
/* CMS - Hailearning
*/
// service
router.get("/service", serviceController.index);
router.post("/service", serviceController.update);
router.get("/api/service", serviceController.api);
// 1. Đưa các route cụ thể (chi tiết nhất) lên đầu tiên
// 2. Route lấy TOÀN BỘ dữ liệu (phải nằm trên route :slug)
router.get("/api/visa", visaController.api);
router.get("/api/visa/hero", visaController.apiHero);
router.get("/api/visa/countries", visaController.apiCountries);
// Service details by slug
router.get("/api/service/:slug", serviceController.getServiceBySlug);
// Service slugs list
router.get("/api/service-slugs", serviceController.getServiceSlugs);
// 3. Route lấy chi tiết theo slug (luôn để dưới cùng của nhóm này)
router.get("/api/visa/:slug", visaController.apiCountry);
module.exports = router;