Refactor Homepage, About, Footer (Controller,Model, View, Data), Update: Dashboard, Delete old file

This commit is contained in:
2026-04-22 15:30:09 +07:00
parent cb5e4b0ceb
commit 3ede974215
67 changed files with 3003 additions and 14780 deletions
+14 -122
View File
@@ -3,28 +3,27 @@ const router = express.Router();
const { ensureAuthenticated } = require("../middleware/auth");
const dashboardController = require("../controllers/dashboardController");
const uploadController = require("../controllers/uploadController");
const homeController = require("../controllers/homeController");
const headerController = require("../controllers/headerController");
const footerController = require("../controllers/footerController");
const aboutUsController = require("../controllers/aboutUsController");
const aboutController = require("../controllers/aboutController");
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
const termsController = require("../controllers/termsController");
const travelController = require("../controllers/travelController");
const visaController = require("../controllers/visaController");
const { upload, uploadVideo, convertToWebp } = require("../middleware/upload");
const safetyController = require("../controllers/safetyController");
const insuranceController = require("../controllers/insuranceController");
const auditLogController = require("../controllers/auditLogController");
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");
@@ -42,7 +41,7 @@ router.get("/dashboard", ensureAuthenticated, dashboardController.getDashboard);
// Home
router.get("/home", ensureAuthenticated, homeController.index);
router.post("/home/update", ensureAuthenticated, homeController.update);
router.get("/home/api/blogs", ensureAuthenticated, homeController.apiGetBlogs);
// router.get("/home/api/blogs", ensureAuthenticated, homeController.apiGetBlogs);
// Middleware chuẩn hóa code
router.param("code", (req, res, next, code) => {
@@ -50,9 +49,9 @@ router.param("code", (req, res, next, code) => {
next();
});
// About Us
router.get("/about-us", ensureAuthenticated, aboutUsController.index);
router.post("/about-us/update", ensureAuthenticated, aboutUsController.update);
// About
router.get("/about", ensureAuthenticated, aboutController.index);
router.post("/about/update", ensureAuthenticated, aboutController.update);
// Booking admin CRUD removed
@@ -150,7 +149,6 @@ router.post(
// Footer routes
router.get("/footer", ensureAuthenticated, footerController.index);
router.post("/footer/update", ensureAuthenticated, footerController.update);
router.get("/footer/data", ensureAuthenticated, footerController.getFooterData);
// Contact routes
router.get("/contact", ensureAuthenticated, contactController.index);
@@ -197,51 +195,6 @@ router.post(
requestInfoController.update,
);
// 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);
@@ -312,18 +265,6 @@ router.get(
ensureAuthenticated,
activityController.exportAllBookingsData,
);
// Update booking submission
router.put(
"/bookings/:bookingId",
ensureAuthenticated,
bookingSubmissionController.updateBookingSubmission,
);
// Delete booking submission
router.delete(
"/bookings/:bookingId",
ensureAuthenticated,
bookingSubmissionController.deleteBookingSubmission,
);
// Update filters
@@ -361,12 +302,12 @@ router.get("/terms/api", termsController.api);
router.get("/terms/seed", ensureAuthenticated, termsController.seed);
// Travel routes
router.get("/travel", ensureAuthenticated, travelController.index);
router.post("/travel/update", ensureAuthenticated, travelController.update);
router.post("/travel/preview", ensureAuthenticated, travelController.preview);
router.get("/travel/data", ensureAuthenticated, travelController.getTravelData);
router.get("/travel/api", travelController.api);
router.get("/travel/seed", ensureAuthenticated, travelController.seed);
// router.get("/travel", ensureAuthenticated, travelController.index);
// router.post("/travel/update", ensureAuthenticated, travelController.update);
// router.post("/travel/preview", ensureAuthenticated, travelController.preview);
// router.get("/travel/data", ensureAuthenticated, travelController.getTravelData);
// router.get("/travel/api", travelController.api);
// router.get("/travel/seed", ensureAuthenticated, travelController.seed);
// Deprecated FAQ API routes removed
@@ -411,30 +352,6 @@ router.post(
insuranceController.update,
);
// Service routes
router.get("/service", ensureAuthenticated, serviceController.index);
router.post("/service/update", ensureAuthenticated, serviceController.update);
router.post(
"/service/generate-slug",
ensureAuthenticated,
serviceController.generateSlug,
);
router.get("/service/:slug/edit", ensureAuthenticated, serviceController.edit);
router.post(
"/service/:slug/edit",
ensureAuthenticated,
serviceController.updateService,
);
router.get(
"/service/:slug/details",
ensureAuthenticated,
serviceController.details,
);
router.post(
"/service/:slug/details/update",
ensureAuthenticated,
serviceController.updateDetails,
);
// Test Image Paths route
router.get("/test-images", ensureAuthenticated, (req, res) => {
@@ -499,31 +416,6 @@ router.get("/test-images", ensureAuthenticated, (req, res) => {
});
});
// Display visa management page
router.get("/visa", ensureAuthenticated, visaController.index);
// Get country data for editing
router.get("/visa/edit/:id", ensureAuthenticated, visaController.getCountry);
// Update hero title
router.post("/visa/update", ensureAuthenticated, visaController.updateCountry);
// Add new country
router.post("/visa/add", ensureAuthenticated, visaController.addCountry);
// Update single country
router.put(
"/visa/update/:id",
ensureAuthenticated,
visaController.updateCountry,
);
// Delete country
router.delete(
"/visa/delete/:id",
ensureAuthenticated,
visaController.deleteCountry,
);
// Programme Management
router.get("/programme", ensureAuthenticated, programmeController.index);
+8 -81
View File
@@ -2,27 +2,25 @@ const express = require("express");
const path = require("path");
const router = express.Router();
const homeController = require("../controllers/homeController");
const aboutUsController = require("../controllers/aboutUsController");
const aboutController = require("../controllers/aboutController");
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");
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");
@@ -40,12 +38,7 @@ router.get("/", (req, res) => {
router.get("/api/home", homeController.api);
// API để lấy dữ liệu about
router.get("/api/about", aboutUsController.getAbout);
router.put("/api/about", aboutUsController.updateAbout);
// Public about-us page and API (legacy support)
router.get("/about-us", aboutUsController.getAbout);
router.get("/api/about-us", aboutUsController.getAbout);
router.get("/api/about", aboutController.api);
// Header API route
router.get("/api/header", headerController.api);
@@ -76,71 +69,20 @@ router.get("/api/request-info", requestInfoController.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);
// Activity API routes
router.get("/api/activities", activityController.api);
router.get("/api/activities/:id", activityController.apiDetail);
// Insurance APi route
router.get("/api/insurance", insuranceController.api);
router.get("/api/terms", termsController.api);
// Travel public page and API
router.get("/travel", async (req, res) => {
try {
const Travel = require("../models/travel");
const travel = await Travel.findOne();
if (!travel) {
return res.status(404).render("errors/404", {
title: "Page Not Found",
message: "Travel information not found",
});
}
res.render("page/travel", {
title: travel.page.title,
data: travel.toObject(),
});
} catch (error) {
console.error("Error loading travel page:", error);
res.status(500).render("errors/500", {
title: "Server Error",
message: "Error loading travel page",
});
}
});
router.get("/api/travel", travelController.api);
// Booking submission APIs (public endpoints)
router.post("/api/booking/submit", bookingSubmissionController.submitBooking);
router.get("/api/activity/:activityId/sessions", bookingSubmissionController.getAvailableSessions);
router.get(
"/api/activity/:activityId/session/:sessionId/availability",
bookingSubmissionController.getSessionAvailability,
);
// Demo booking form
router.get("/demo/booking-form", (req, res) => {
res.sendFile(path.join(__dirname, "../views/demo/booking-form.html"));
});
// Demo session booking API
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);
@@ -168,21 +110,6 @@ router.get("/api/blog/:slug", blogController.apiShow);
// // API route cho blog detail
// router.get('/api/blog-detail', blogDetailController.api);
/* CMS - Hailearning
*/
// service
router.get("/service", serviceController.index);
router.post("/service", serviceController.update);
router.get("/api/service", serviceController.api);
// Service details by slug
router.get("/api/service/:slug", serviceController.getServiceBySlug);
// Service slugs list
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);