Merge branch 'develop' into fea/dat-20042026-CMS-Partnerships-Accreditation-History-Admissions-Policies

routes/admin.js

@@ -14,6 +14,8 @@ const admissionsController = require("../controllers/admissionsController");
 const policiesController = require("../controllers/policiesController");
 const formController = require("../controllers/formController");
 const contactController = require("../controllers/contactController");
+const studentSupportController = require("../controllers/studentSupportController");
+const requestInfoController = require("../controllers/requestInfoController");
 const pageController = require("../controllers/pageController");
 const settingController = require("../controllers/settingController");
 const faqController = require("../controllers/faqController"); // Thêm import này
@@ -29,6 +31,7 @@ const activityController = require("../controllers/activityController");
 const bookingSubmissionController = require("../controllers/bookingSubmissionController");
 const serviceController = require("../controllers/serviceController");
 const headerMenuController = require("../controllers/headerMenuController");
+const programmeController = require("../controllers/programmeController");
 
 // Blog controllers
 const blogController = require("../controllers/blogController");
@@ -211,6 +214,30 @@ router.put(
   contactController.updateSubmissionStatus,
 );
 
+// Student Support (LAMS static page)
+router.get(
+  "/student-support",
+  ensureAuthenticated,
+  studentSupportController.index,
+);
+router.post(
+  "/student-support/update",
+  ensureAuthenticated,
+  studentSupportController.update,
+);
+
+// Request Info (LAMS static page)
+router.get(
+  "/request-info",
+  ensureAuthenticated,
+  requestInfoController.index,
+);
+router.post(
+  "/request-info/update",
+  ensureAuthenticated,
+  requestInfoController.update,
+);
+
 // Appointment management
 const appointmentController = require("../controllers/appointmentController");
 router.get(
@@ -538,6 +565,13 @@ router.delete(
   ensureAuthenticated,
   visaController.deleteCountry,
 );
+
+// Programme Management
+router.get("/programme", ensureAuthenticated, programmeController.index);
+router.get("/programme/edit/:id", ensureAuthenticated, programmeController.edit);
+router.post("/programme/update/:id", ensureAuthenticated, upload.single('heroImage'), programmeController.update);
+router.post("/programme/delete/:id", ensureAuthenticated, programmeController.delete);
+
 // Blog routes
 // Blog Management Routes
 router.get("/blog", ensureAuthenticated, blogController.index);

routes/index.js

@@ -12,12 +12,15 @@ const headerController = require("../controllers/headerController");
 const socialLinkController = require("../controllers/socialLinkController");
 const footerController = require("../controllers/footerController");
 const contactController = require("../controllers/contactController");
+const studentSupportController = require("../controllers/studentSupportController");
+const requestInfoController = require("../controllers/requestInfoController");
 const faqController = require("../controllers/faqController");
 const visaController = require("../controllers/visaController");
 const headerMenuController = require("../controllers/headerMenuController");
 const safetyController = require("../controllers/safetyController");
 // Booking flow removed
 
+const programmeController = require("../controllers/programmeController");
 const insuranceController = require("../controllers/insuranceController");
 const termsController = require("../controllers/termsController"); // <-- IMPORT ĐÃ CÓ
 const activityController = require("../controllers/activityController");
@@ -74,6 +77,12 @@ router.put("/api/admin/footer", footerController.updateFooter);
 // Contact API route
 router.get("/api/contact", contactController.api);
 
+// Student Support page (public API for frontend LAMS)
+router.get("/api/student-support", studentSupportController.api);
+
+// Request Info page (public API for frontend LAMS)
+router.get("/api/request-info", requestInfoController.api);
+
 // Contact form submission (public)
 router.post("/api/contact/submit", contactController.submitForm);
 
@@ -185,6 +194,10 @@ router.get("/api/service-slugs", serviceController.getServiceSlugs);
 router.get("/api/visa", visaController.api);
 router.get("/api/visa/country", visaController.apiCountries);
 
+// Programmes API
+router.get("/api/programmes", programmeController.api);
+router.get("/api/programmes/:id", programmeController.apiDetail);
+
 // Testimonials API
 const testimonialController = require("../controllers/testimonialController");
 router.get("/api/testimonials", testimonialController.api);