Fix merge conflicts with main

routes/admin.js

@@ -24,6 +24,11 @@ const insuranceController = require("../controllers/insuranceController");
 const activityController = require("../controllers/activityController");
 const bookingSubmissionController = require("../controllers/bookingSubmissionController");
 
+// Blog controllers
+const blogController = require("../controllers/blogController");
+const blogCategoryController = require("../controllers/blogCategoryController");
+const blogTagController = require("../controllers/blogTagController");
+
 // Dashboard
 router.get("/dashboard", ensureAuthenticated, dashboardController.getDashboard);
 
@@ -151,6 +156,64 @@ router.get(
   contactController.getContactData,
 );
 
+// Contact submissions management
+router.get(
+  "/contact/submissions",
+  ensureAuthenticated,
+  contactController.getSubmissions,
+);
+router.put(
+  "/contact/submissions/:id",
+  ensureAuthenticated,
+  contactController.updateSubmissionStatus,
+);
+
+// Appointment management
+const appointmentController = require("../controllers/appointmentController");
+router.get(
+  "/appointments",
+  ensureAuthenticated,
+  appointmentController.getAppointments,
+);
+router.get(
+  "/appointments/:id",
+  ensureAuthenticated,
+  appointmentController.getAppointmentById,
+);
+router.put(
+  "/appointments/:id",
+  ensureAuthenticated,
+  appointmentController.updateAppointmentStatus,
+);
+router.delete(
+  "/appointments/:id",
+  ensureAuthenticated,
+  appointmentController.deleteAppointment,
+);
+
+// Appointment CMS page management
+router.get("/appointment", ensureAuthenticated, appointmentController.index);
+router.post(
+  "/appointment/update",
+  ensureAuthenticated,
+  appointmentController.update,
+);
+router.get(
+  "/appointment/data",
+  ensureAuthenticated,
+  appointmentController.getAppointmentData,
+);
+
+// Pricing CMS page management
+const pricingController = require("../controllers/pricingController");
+router.get("/pricing", ensureAuthenticated, pricingController.index);
+router.post("/pricing/update", ensureAuthenticated, pricingController.update);
+router.get(
+  "/pricing/data",
+  ensureAuthenticated,
+  pricingController.getPricingData,
+);
+
 // Activity CRUD routes
 router.get("/activity", ensureAuthenticated, activityController.index);
 router.get(
@@ -406,4 +469,61 @@ router.delete(
   ensureAuthenticated,
   visaController.deleteCountry,
 );
+// Blog routes
+// Blog Management Routes
+router.get("/blog", ensureAuthenticated, blogController.index);
+router.get("/blog/create", ensureAuthenticated, blogController.create);
+router.post("/blog/create", ensureAuthenticated, blogController.store);
+router.get("/blog/:id/edit", ensureAuthenticated, blogController.edit);
+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,
+);
+
+// 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,
+);
+
 module.exports = router;

routes/index.js

@@ -19,6 +19,11 @@ const activityController = require("../controllers/activityController");
 const travelController = require("../controllers/travelController");
 const bookingSubmissionController = require("../controllers/bookingSubmissionController");
 
+// Blog controllers
+const blogController = require("../controllers/blogController");
+const blogCategoryController = require("../controllers/blogCategoryController");
+const blogTagController = require("../controllers/blogTagController");
+
 // Trang chủ
 router.get("/", (req, res) => {
   res.render("index", {
@@ -50,6 +55,18 @@ router.get("/api/footer", footerController.api);
 // Contact API route
 router.get("/api/contact", contactController.api);
 
+// Contact form submission (public)
+router.post("/api/contact/submit", contactController.submitForm);
+
+// Appointment API
+const appointmentController = require("../controllers/appointmentController");
+router.get("/api/appointment", appointmentController.api);
+router.post("/api/appointment/submit", appointmentController.submitAppointment);
+
+// Pricing API
+const pricingController = require("../controllers/pricingController");
+router.get("/api/pricing", pricingController.api);
+
 router.get("/api/faq", faqController.api);
 // Safety API route
 router.get("/api/safety", safetyController.api);
@@ -132,6 +149,27 @@ router.get("/demo/session-booking-api", (req, res) => {
   res.sendFile(path.join(__dirname, "../views/demo/session-booking-api.html"));
 });
 
+// Blog API Routes
+router.get("/api/blog", blogController.api);
+router.get("/api/blog/featured", blogController.apiFeatured);
+router.get("/api/blog/recent", blogController.apiRecent);
+
+// Blog Categories API (must come before /api/blog/:slug)
+router.get("/api/blog/categories", blogCategoryController.api);
+router.get("/api/blog/categories/:slug", blogCategoryController.apiShow);
+
+// Blog Tags API (must come before /api/blog/:slug)
+router.get("/api/blog/tags", blogTagController.api);
+router.get("/api/blog/tags/popular", blogTagController.apiPopular);
+router.get("/api/blog/tags/:slug", blogTagController.apiShow);
+
+// Blog post specific APIs (must come before /api/blog/:slug)
+router.get("/api/blog/:id/categories", blogController.apiCategories);
+router.get("/api/blog/:id/tags", blogController.apiTags);
+
+// 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);