From 107a61c9cbdb59b64df4561ffcb9ce200175280f Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <1697880+AngelFQC@users.noreply.github.com>
Date: Fri, 17 Jan 2025 01:11:26 -0500
Subject: [PATCH] Unify router modules for course and session catalog

---
 assets/vue/router/catalogue.js         | 17 +++++++++++++++++
 assets/vue/router/cataloguecourses.js  |  6 ------
 assets/vue/router/cataloguesessions.js |  6 ------
 assets/vue/router/index.js             |  6 ++----
 4 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 assets/vue/router/catalogue.js
 delete mode 100644 assets/vue/router/cataloguecourses.js
 delete mode 100644 assets/vue/router/cataloguesessions.js

diff --git a/assets/vue/router/catalogue.js b/assets/vue/router/catalogue.js
new file mode 100644
index 0000000000..9c58ca388e
--- /dev/null
+++ b/assets/vue/router/catalogue.js
@@ -0,0 +1,17 @@
+export default {
+  path: "/catalogue",
+  meta: { requiresAdmin: true, requiresSessionAdmin: true },
+  component: () => import("../components/layout/SimpleRouterViewLayout.vue"),
+  children: [
+    {
+      path: "courses",
+      name: "CatalogueCourses",
+      component: () => import("../views/course/CatalogueCourses.vue"),
+    },
+    {
+      path: "sessions",
+      name: "CatalogueSessions",
+      component: () => import("../views/course/CatalogueSessions.vue"),
+    },
+  ],
+}
diff --git a/assets/vue/router/cataloguecourses.js b/assets/vue/router/cataloguecourses.js
deleted file mode 100644
index 29c97e03bc..0000000000
--- a/assets/vue/router/cataloguecourses.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  path: "/catalogue/courses",
-  name: "CatalogueCourses",
-  meta: { requiresAdmin: true, requiresSessionAdmin: true },
-  component: () => import("../views/course/CatalogueCourses.vue"),
-}
diff --git a/assets/vue/router/cataloguesessions.js b/assets/vue/router/cataloguesessions.js
deleted file mode 100644
index 336307b201..0000000000
--- a/assets/vue/router/cataloguesessions.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  path: "/catalogue/sessions",
-  name: "CatalogueSessions",
-  meta: { requiresAdmin: true, requiresSessionAdmin: true },
-  component: () => import("../views/course/CatalogueSessions.vue"),
-}
diff --git a/assets/vue/router/index.js b/assets/vue/router/index.js
index 86e51c5cae..e772920745 100644
--- a/assets/vue/router/index.js
+++ b/assets/vue/router/index.js
@@ -21,6 +21,7 @@ import documents from "./documents"
 import assignments from "./assignments"
 import links from "./links"
 import glossary from "./glossary"
+import catalogue from "./catalogue"
 import { useSecurityStore } from "../store/securityStore"
 import MyCourseList from "../views/user/courses/List.vue"
 import MySessionList from "../views/user/sessions/SessionsCurrent.vue"
@@ -41,8 +42,6 @@ import Demo from "../pages/Demo.vue"
 import { useCidReqStore } from "../store/cidReq"
 import courseService from "../services/courseService"
 
-import catalogueCourses from "./cataloguecourses"
-import catalogueSessions from "./cataloguesessions"
 import { customVueTemplateEnabled } from "../config/env"
 import { useCourseSettings } from "../store/courseSettingStore"
 import { checkIsAllowedToEdit, useUserSessionSubscription } from "../composables/userPermissions"
@@ -227,8 +226,7 @@ const router = createRouter({
     fileManagerRoutes,
     termsRoutes,
     socialNetworkRoutes,
-    catalogueCourses,
-    catalogueSessions,
+    catalogue,
     adminRoutes,
     courseRoutes,
     //courseCategoryRoutes,