forked from UKSOURCE/cms.hailearning.edu.vn
fix conflig pull request
This commit is contained in:
@@ -23,6 +23,7 @@ const insuranceController = require("../controllers/insuranceController");
|
||||
|
||||
const activityController = require("../controllers/activityController");
|
||||
const bookingSubmissionController = require("../controllers/bookingSubmissionController");
|
||||
const serviceController = require("../controllers/serviceController");
|
||||
|
||||
// Blog controllers
|
||||
const blogController = require("../controllers/blogController");
|
||||
@@ -384,6 +385,35 @@ router.post(
|
||||
ensureAuthenticated,
|
||||
insuranceController.update,
|
||||
);
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
// 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,
|
||||
);
|
||||
|
||||
>>>>>>> a255d09ef0a6eb0c487595aac19cefbf729d78a2
|
||||
// Test Image Paths route
|
||||
router.get("/test-images", ensureAuthenticated, (req, res) => {
|
||||
const fs = require("fs");
|
||||
@@ -479,51 +509,21 @@ 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.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/: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;
|
||||
|
||||
Reference in New Issue
Block a user