diff --git a/assets/vue/components/Login.vue b/assets/vue/components/Login.vue
index e027339d0da..db6e90d78ef 100644
--- a/assets/vue/components/Login.vue
+++ b/assets/vue/components/Login.vue
@@ -113,17 +113,26 @@ const requires2FA = ref(false)
 redirectNotAuthenticated()
 
 async function onSubmitLoginForm() {
-  const response = await performLogin({
-    login: login.value,
-    password: password.value,
-    totp: requires2FA.value ? totp.value : null,
-    _remember_me: remember.value,
-  })
-
-  if (response.requires2FA) {
-    requires2FA.value = true
-  } else {
-    await router.replace({ name: "Home" })
+  try {
+    const response = await performLogin({
+      login: login.value,
+      password: password.value,
+      totp: requires2FA.value ? totp.value : null,
+      _remember_me: remember.value,
+    })
+
+    if (!response) {
+      console.warn("[Login] No response from performLogin.")
+      return
+    }
+
+    if (response.requires2FA) {
+      requires2FA.value = true
+    } else {
+      await router.replace({ name: "Home" })
+    }
+  } catch (error) {
+    console.error("[Login] performLogin failed:", error)
   }
 }
 </script>
diff --git a/assets/vue/components/course/CatalogueCourseCard.vue b/assets/vue/components/course/CatalogueCourseCard.vue
index 6859758fd65..e6af0d7d39f 100644
--- a/assets/vue/components/course/CatalogueCourseCard.vue
+++ b/assets/vue/components/course/CatalogueCourseCard.vue
@@ -1,16 +1,65 @@
 <template>
   <div
-    class="course-card hover:shadow-lg transition duration-300 rounded-2xl overflow-hidden border border-gray-300 bg-white flex flex-col"
+    class="course-card relative hover:shadow-lg transition duration-300 rounded-2xl overflow-hidden border border-gray-300 bg-white flex flex-col"
   >
+    <div
+      v-if="course.categories?.length"
+      class="absolute top-2 left-2 flex flex-wrap gap-1 z-30"
+    >
+      <span
+        v-for="cat in course.categories"
+        :key="cat.id"
+        class="bg-support-5 text-white text-xs font-bold px-2 py-0.5 rounded"
+      >
+        {{ cat.title }}
+      </span>
+    </div>
+    <span
+      v-if="course.courseLanguage"
+      class="absolute top-0 right-0 bg-support-4 text-white text-xs px-2 py-0.5 font-semibold rounded-bl-lg z-20"
+    >
+      {{ course.courseLanguage }}
+    </span>
+
+    <Button
+      v-if="allowDescription && showInfoPopup"
+      icon="pi pi-info-circle"
+      @click="showDescriptionDialog = true"
+      class="absolute top-10 left-2 z-20"
+      size="small"
+      text
+      aria-label="Course info"
+    />
+    <router-link
+      v-if="imageLink"
+      :to="imageLink"
+    >
+      <img
+        :src="course.illustrationUrl"
+        :alt="course.title"
+        class="w-full object-cover"
+      />
+    </router-link>
     <img
+      v-else
       :src="course.illustrationUrl"
       :alt="course.title"
       class="w-full object-cover"
     />
     <div class="p-4 flex flex-col flex-grow gap-2">
-      <h3 class="text-xl font-semibold text-gray-800">{{ course.title }}</h3>
-      <p class="text-sm text-gray-600 line-clamp-3">{{ course.description }}</p>
-
+      <router-link
+        v-if="showTitle && titleLink"
+        :to="titleLink"
+        class="text-xl font-semibold"
+      >
+        {{ course.title }}
+      </router-link>
+      <h3
+        v-else-if="showTitle"
+        class="text-xl font-semibold"
+      >
+        {{ course.title }}
+      </h3>
       <div
         v-if="course.duration"
         class="text-sm text-gray-700"
@@ -33,24 +82,6 @@
         <strong>{{ $t("Price") }}:</strong>
         {{ course.price > 0 ? "S/. " + course.price.toFixed(2) : $t("Free") }}
       </div>
-
-      <div
-        v-if="course.categories?.length"
-        class="flex flex-wrap gap-1"
-      >
-        <span
-          v-for="cat in course.categories"
-          :key="cat.id"
-          class="text-xs bg-blue-100 text-blue-800 px-2 py-1 rounded-full"
-        >
-          {{ cat.title }}
-        </span>
-      </div>
-
-      <div class="text-sm text-gray-700">
-        <strong>{{ $t("Language") }}:</strong> {{ course.courseLanguage }}
-      </div>
-
       <div
         v-if="course.teachers?.length"
         class="text-sm text-gray-700"
@@ -58,8 +89,8 @@
         <strong>{{ $t("Teachers") }}:</strong>
         {{ course.teachers.map((t) => t.user.fullName).join(", ") }}
       </div>
-
       <Rating
+        v-if="props.currentUserId"
         :model-value="course.userVote?.vote || 0"
         :stars="5"
         :cancel="false"
@@ -79,6 +110,15 @@
         </span>
       </div>
 
+      <div
+        v-for="field in cardExtraFields"
+        :key="field.variable"
+        class="text-sm text-gray-700"
+      >
+        <strong>{{ field.display_text }}:</strong>
+        {{ course.extra_fields?.[field.variable] ?? "-" }}
+      </div>
+
       <div class="mt-auto pt-2">
         <router-link
           v-if="course.visibility === 3 || (course.visibility === 2 && isUserInCourse)"
@@ -125,26 +165,55 @@
       </div>
     </div>
   </div>
+  <Dialog
+    v-model:visible="showDescriptionDialog"
+    :header="course.title"
+    modal
+    class="w-96"
+  >
+    <p class="text-sm text-gray-700 whitespace-pre-line">
+      {{ course.description || $t("No description available") }}
+    </p>
+  </Dialog>
 </template>
 <script setup>
 import Rating from "primevue/rating"
 import Button from "primevue/button"
 import { computed, ref } from "vue"
 import courseRelUserService from "../../services/courseRelUserService"
-import { useRouter } from "vue-router"
+import { useRoute, useRouter } from "vue-router"
 import { useNotification } from "../../composables/notification"
+import Dialog from "primevue/dialog"
+import { usePlatformConfig } from "../../store/platformConfig"
+
+const platformConfigStore = usePlatformConfig()
+const showDescriptionDialog = ref(false)
+
+const allowDescription = computed(
+  () => platformConfigStore.getSetting("course.show_courses_descriptions_in_catalog") !== "false",
+)
 
 const props = defineProps({
   course: Object,
-  currentUserId: Number,
+  currentUserId: {
+    type: Number,
+    default: null,
+  },
+  showTitle: {
+    type: Boolean,
+    default: true,
+  },
+  cardExtraFields: { type: Array, default: () => [] },
 })
 
 const emit = defineEmits(["rate", "subscribed"])
 
 const router = useRouter()
+const route = useRoute()
 const { showErrorNotification, showSuccessNotification } = useNotification()
 
 const isUserInCourse = computed(() => {
+  if (!props.currentUserId) return false
   return props.course.users?.some((user) => user.user.id === props.currentUserId)
 })
 
@@ -160,21 +229,108 @@ const emitRating = (event) => {
 
 const subscribing = ref(false)
 const subscribeToCourse = async () => {
+  if (!props.currentUserId) {
+    showErrorNotification("You must be logged in to subscribe to a course.")
+    return
+  }
+
   try {
     subscribing.value = true
 
-    const response = await courseRelUserService.subscribe({
-      userId: props.currentUserId,
-      courseId: props.course.id,
-    })
+    const useAutoSession =
+      platformConfigStore.getSetting("session.catalog_course_subscription_in_user_s_session") === "true"
+
+    let sessionId = null
+
+    if (useAutoSession) {
+      const response = await courseRelUserService.autoSubscribeCourse(props.course.id)
+      sessionId = response?.sessionId
+
+      if (!sessionId) {
+        throw new Error("No session ID returned after subscription.")
+      }
+    } else {
+      const response = await courseRelUserService.subscribe({
+        userId: props.currentUserId,
+        courseId: props.course.id,
+      })
+
+      const userIdFromResponse = response?.user?.["@id"]?.split("/")?.pop()
+
+      emit("subscribed", {
+        courseId: props.course.id,
+        newUser: { user: { id: Number(userIdFromResponse) } },
+      })
+    }
 
-    emit("subscribed", { courseId: props.course.id, newUser: response })
     showSuccessNotification("You have successfully subscribed to this course.")
-    router.push({ name: "CourseHome", params: { id: props.course.id } })
+
+    await router.push({
+      name: "CourseHome",
+      params: {
+        id: props.course.id,
+      },
+      query: sessionId ? { sid: sessionId } : {},
+    })
   } catch (e) {
+    console.error("Subscription error:", e)
     showErrorNotification("Failed to subscribe to the course.")
   } finally {
     subscribing.value = false
   }
 }
+
+function routeExists(name) {
+  return router.getRoutes().some((route) => route.name === name)
+}
+
+const linkSettings = computed(() => {
+  const settings = platformConfigStore.getSetting("course.course_catalog_settings")
+  const result = settings?.link_settings ?? {}
+  console.log("Link settings:", result)
+  return result
+})
+
+const imageLink = computed(() => {
+  const routeName =
+    linkSettings.value.image_url === "course_home"
+      ? "CourseHome"
+      : linkSettings.value.image_url === "course_about"
+        ? "CourseAbout"
+        : null
+
+  if (routeName && routeExists(routeName)) {
+    return { name: routeName, params: { id: props.course.id } }
+  }
+
+  if (routeName) {
+    console.warn(`[CatalogueCourseCard] Route '${routeName}' does not exist.`)
+  }
+
+  return null
+})
+
+const titleLink = computed(() => {
+  const routeName = linkSettings.value.title_url === "course_home" ? "CourseHome" : null
+
+  if (routeName && routeExists(routeName)) {
+    return { name: routeName, params: { id: props.course.id } }
+  }
+
+  if (routeName) {
+    console.warn(`[CatalogueCourseCard] Route '${routeName}' does not exist.`)
+  }
+
+  return null
+})
+
+const showInfoPopup = computed(() => {
+  const allowed = ["course_description_popup"]
+  const value = linkSettings.value.info_url
+  if (value && !allowed.includes(value)) {
+    console.warn(`[CatalogueCourseCard] info_url '${value}' is not a recognized option.`)
+    return false
+  }
+  return value === "course_description_popup"
+})
 </script>
diff --git a/assets/vue/components/layout/TopbarNotLoggedIn.vue b/assets/vue/components/layout/TopbarNotLoggedIn.vue
index e5f4ce60c95..e5bbc7d1980 100644
--- a/assets/vue/components/layout/TopbarNotLoggedIn.vue
+++ b/assets/vue/components/layout/TopbarNotLoggedIn.vue
@@ -63,6 +63,18 @@ const menuItems = computed(() => {
     })
   }
 
+  const showCatalogueLink =
+    platformConfigStore.getSetting("course.course_catalog_published") !== "false" &&
+    platformConfigStore.getSetting("course.catalog_hide_public_link") !== "true" &&
+    platformConfigStore.getSetting("display.allow_students_to_browse_courses") !== "false"
+
+  if (showCatalogueLink) {
+    items.splice(1, 0, {
+      label: t("Browse courses"),
+      url: router.resolve({ name: "CatalogueCourses" }).href,
+    })
+  }
+
   console.log("Menu Items:", items)
   return items
 })
diff --git a/assets/vue/components/session/CatalogueSessionCard.vue b/assets/vue/components/session/CatalogueSessionCard.vue
index 5c74722c2a3..e819b5b62d2 100644
--- a/assets/vue/components/session/CatalogueSessionCard.vue
+++ b/assets/vue/components/session/CatalogueSessionCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="course-card hover:shadow-lg transition duration-300 rounded-2xl overflow-hidden border border-gray-300 bg-white flex flex-col"
+    class="course-card relative hover:shadow-lg transition duration-300 rounded-2xl overflow-hidden border border-gray-300 bg-white flex flex-col"
   >
     <div
       v-if="!hasThumbnail"
@@ -15,15 +15,23 @@
       class="w-full h-40 object-cover"
       @error="onImageError"
     />
-
+    <Button
+      v-if="allowDescription"
+      icon="pi pi-info-circle"
+      @click="showDescriptionDialog = true"
+      class="absolute top-2 left-2 z-20"
+      size="small"
+      text
+      aria-label="Session info"
+    />
+    <span
+      v-if="languages.length"
+      class="absolute top-0 right-0 bg-primary text-white text-xs px-2 py-1 font-semibold rounded-bl-lg z-10"
+    >
+      {{ languages.length === 1 ? languages[0] : $t("Multilingual") }}
+    </span>
     <div class="p-4 flex flex-col flex-grow gap-2">
       <h3 class="text-xl font-semibold text-gray-800">{{ session.title }}</h3>
-      <p
-        v-if="session.description"
-        class="text-sm text-gray-600 line-clamp-3"
-        v-html="session.description"
-      />
-
       <div class="text-sm text-gray-700">
         <strong>{{ $t("Duration") }}:</strong> {{ duration }}
       </div>
@@ -50,13 +58,6 @@
         <strong>{{ $t("Category") }}:</strong> {{ session.category.title }}
       </div>
 
-      <div
-        v-if="languages.length"
-        class="text-sm text-gray-700"
-      >
-        <strong>{{ $t("Languages") }}:</strong> {{ languages.join(", ") }}
-      </div>
-
       <div
         v-if="teachers.length"
         class="text-sm text-gray-700"
@@ -91,18 +92,19 @@
         />
 
         <Button
-          v-else-if="!session.isSubscribed"
-          :label="$t('Subscribe')"
-          icon="pi pi-user-plus"
+          v-else-if="allowAutoSubscription && !session.isSubscribed"
+          :label="isLoading ? $t('Subscribing...') : $t('Subscribe')"
+          :icon="isLoading ? 'pi pi-spin pi-spinner' : 'pi pi-user-plus'"
           class="w-full p-button-success"
+          :disabled="isLoading"
           @click="subscribeToSession"
         />
 
         <Button
-          v-else-if="isFuture"
+          v-else-if="session.isSubscribed && isFuture"
           :label="$t('Registered')"
           icon="pi pi-check"
-          class="w-full p-button- p-button-outlined"
+          class="w-full p-button-outlined"
           disabled
         />
 
@@ -169,6 +171,17 @@
       </ul>
     </Dialog>
   </div>
+  <Dialog
+    v-model:visible="showDescriptionDialog"
+    :header="session.title"
+    modal
+    class="w-96"
+  >
+    <p
+      class="text-sm text-gray-700 whitespace-pre-line"
+      v-html="session.description || $t('No description available')"
+    />
+  </Dialog>
 </template>
 <script setup>
 import { ref, computed, watchEffect } from "vue"
@@ -177,6 +190,13 @@ import Button from "primevue/button"
 import Dialog from "primevue/dialog"
 import axios from "axios"
 import { useSecurityStore } from "../../store/securityStore"
+import { usePlatformConfig } from "../../store/platformConfig"
+
+const showDescriptionDialog = ref(false)
+const platformConfigStore = usePlatformConfig()
+const allowDescription = computed(
+  () => platformConfigStore.getSetting("course.show_courses_descriptions_in_catalog") !== "false",
+)
 
 const showGoDialog = ref(false)
 const isLoading = ref(false)
@@ -185,6 +205,10 @@ const emitRating = (event) => {
   emit("rate", { value: event.value, session: props.session })
 }
 
+const allowAutoSubscription = computed(
+  () => platformConfigStore.getSetting("session.catalog_allow_session_auto_subscription") === "true",
+)
+
 const props = defineProps({
   session: Object,
 })
diff --git a/assets/vue/composables/sidebarMenu.js b/assets/vue/composables/sidebarMenu.js
index 147e1776c64..21d600d2271 100644
--- a/assets/vue/composables/sidebarMenu.js
+++ b/assets/vue/composables/sidebarMenu.js
@@ -15,6 +15,7 @@ export function useSidebarMenu() {
   const { items: socialItems } = useSocialMenuItems()
   const showTabsSetting = platformConfigStore.getSetting("platform.show_tabs")
   const showCatalogue = platformConfigStore.getSetting("platform.catalog_show_courses_sessions")
+  const allowStudentCatalogue = platformConfigStore.getSetting("display.allow_students_to_browse_courses") !== "false"
 
   const isActive = (item) => {
     if (item.route) {
@@ -81,13 +82,13 @@ export function useSidebarMenu() {
   const menuItemsAfterMyCourse = computed(() => {
     const items = []
 
-    if (showTabsSetting.indexOf("catalogue") > -1) {
-      if (showCatalogue == 0 || showCatalogue == 2) {
+    if (allowStudentCatalogue && showTabsSetting.indexOf("catalogue") > -1) {
+      if (showCatalogue === 0 || showCatalogue === 2) {
         items.push(createMenuItem("catalogue", "mdi-bookmark-multiple", "Explore more courses", "CatalogueCourses"))
       }
       if (showCatalogue > 0) {
         items.push(
-          createMenuItem("catalogue", "mdi-bookmark-multiple-outline", "Sessions catalogue", "CatalogueSessions"),
+          createMenuItem("catalogue", "mdi-bookmark-multiple-outline", "Sessions catalogue", "CatalogueSessions")
         )
       }
     }
diff --git a/assets/vue/pages/Home.vue b/assets/vue/pages/Home.vue
index c9edf7b46c0..7e4ff513609 100644
--- a/assets/vue/pages/Home.vue
+++ b/assets/vue/pages/Home.vue
@@ -1,23 +1,111 @@
 <template>
-  <!-- Homepage for logged-in users -->
   <div class="flex flex-col gap-4 items-center">
     <SystemAnnouncementCardList />
-
     <PageCardList class="grid gap-4 grid-cols-1" />
+
+    <div
+      v-if="showCatalogue && visibleCourses.length"
+      class="w-full mt-8"
+    >
+      <h2 class="text-xl font-semibold mb-4">
+        {{ $t("Featured courses") }}
+      </h2>
+      <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
+        <CatalogueCourseCard
+          v-for="course in visibleCourses"
+          :key="course.id"
+          :course="course"
+          :show-title="true"
+          :current-user-id="currentUserId"
+          :card-extra-fields="[]"
+          @subscribed="onUserSubscribed"
+        />
+      </div>
+
+      <div
+        class="mt-6 text-center"
+        v-if="visibleCourses.length < allCourses.length"
+      >
+        <Button
+          :label="$t('Show more courses')"
+          icon="pi pi-angle-down"
+          class="p-button-outlined"
+          @click="loadMore"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup>
+import { ref, onMounted, computed } from "vue"
 import { useRouter } from "vue-router"
-import PageCardList from "../components/page/PageCardList"
-import SystemAnnouncementCardList from "../components/systemannouncement/SystemAnnouncementCardList"
 import { usePlatformConfig } from "../store/platformConfig"
+import courseService from "../services/courseService"
+import CatalogueCourseCard from "../components/course/CatalogueCourseCard.vue"
+import SystemAnnouncementCardList from "../components/systemannouncement/SystemAnnouncementCardList.vue"
+import PageCardList from "../components/page/PageCardList.vue"
+import Button from "primevue/button"
+import { useSecurityStore } from "../store/securityStore"
+import * as userRelCourseVoteService from "../services/userRelCourseVoteService"
 
 const router = useRouter()
 const platformConfigStore = usePlatformConfig()
-
 const redirectValue = platformConfigStore.getSetting("platform.redirect_index_to_url_for_logged_users")
+
 if (typeof redirectValue === "string" && redirectValue.trim() !== "") {
   router.replace(`/${redirectValue}`)
 }
+
+const showCatalogue = computed(() => platformConfigStore.getSetting("course.course_catalog_display_in_home") === "true")
+const allCourses = ref([])
+const visibleCourses = ref([])
+const pageSize = 8
+const securityStore = useSecurityStore()
+const currentUserId = securityStore.user?.id ?? null
+
+const loadMore = () => {
+  const nextItems = allCourses.value.slice(visibleCourses.value.length, visibleCourses.value.length + pageSize)
+  visibleCourses.value.push(...nextItems)
+}
+
+const onUserSubscribed = ({ courseId, newUser }) => {
+  const course = allCourses.value.find((c) => c.id === courseId)
+  if (course) {
+    course.users.push(newUser)
+  }
+}
+
+onMounted(async () => {
+  if (showCatalogue.value) {
+    try {
+      const loaded = await courseService.loadCourseCatalogue()
+      allCourses.value = loaded
+      visibleCourses.value = loaded.slice(0, pageSize)
+
+      if (currentUserId) {
+        const votes = await userRelCourseVoteService.getUserVotes({
+          userId: currentUserId,
+          urlId: window.access_url_id,
+        })
+
+        for (const vote of votes) {
+          let courseId
+          if (typeof vote.course === "object" && vote.course !== null) {
+            courseId = vote.course.id
+          } else if (typeof vote.course === "string") {
+            courseId = parseInt(vote.course.split("/").pop())
+          }
+
+          const course = allCourses.value.find((c) => c.id === courseId)
+          if (course) {
+            course.userVote = vote
+          }
+        }
+      }
+    } catch (e) {
+      console.warn("Catalogue load failed:", e)
+    }
+  }
+})
 </script>
diff --git a/assets/vue/services/courseRelUserService.js b/assets/vue/services/courseRelUserService.js
index 841e52c0850..33dee1ba188 100644
--- a/assets/vue/services/courseRelUserService.js
+++ b/assets/vue/services/courseRelUserService.js
@@ -24,7 +24,12 @@ async function subscribe({ userId, courseId }) {
   })
 }
 
+async function autoSubscribeCourse(courseId) {
+  return await baseService.post(`/catalogue/auto-subscribe-course/${courseId}`)
+}
+
 export default {
   findAll,
   subscribe,
+  autoSubscribeCourse,
 }
diff --git a/assets/vue/services/courseService.js b/assets/vue/services/courseService.js
index 8c696d523f1..9e1bd779516 100644
--- a/assets/vue/services/courseService.js
+++ b/assets/vue/services/courseService.js
@@ -187,4 +187,21 @@ export default {
     const response = await api.get("/catalogue/courses-list")
     return response.data
   },
+  loadCourseCatalogue: async () => {
+    try {
+      const response = await fetch("/api/public_courses")
+      if (!response.ok) throw new Error("Failed to load catalogue courses")
+
+      const data = await response.json()
+      const items = Array.isArray(data) ? data : (data["hydra:member"] ?? data.items ?? [])
+      return items.map((course) => ({
+        ...course,
+        userVote: null,
+        extra_fields: course.extra_fields || {},
+      }))
+    } catch (e) {
+      console.error("loadCourseCatalogue error:", e)
+      return []
+    }
+  },
 }
diff --git a/assets/vue/views/course/CatalogueCourses.vue b/assets/vue/views/course/CatalogueCourses.vue
index ffd1773d50a..412787e8478 100644
--- a/assets/vue/views/course/CatalogueCourses.vue
+++ b/assets/vue/views/course/CatalogueCourses.vue
@@ -14,17 +14,80 @@
           icon="pi pi-filter-slash"
           @click="clearFilter()"
         />
-        <span class="p-input-icon-left">
-          <i class="pi pi-search" />
+        <Button
+          :label="$t('Advanced search')"
+          class="p-button-outlined"
+          icon="pi pi-sliders-h"
+          @click="showAdvancedSearch = !showAdvancedSearch"
+        />
+        <Dropdown
+          v-if="allSortOptions.length"
+          v-model="sortField"
+          :options="allSortOptions"
+          optionLabel="label"
+          optionValue="value"
+          :placeholder="$t('Sort by')"
+          class="w-64"
+        />
+        <div class="relative">
+          <i class="pi pi-search absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400" />
           <InputText
             v-model="filters['global'].value"
             :placeholder="$t('Search')"
-            class="w-64"
+            class="pl-10 w-64"
           />
-        </span>
+        </div>
       </div>
     </div>
+    <div
+      v-if="showAdvancedSearch"
+      class="p-4 border border-gray-300 rounded bg-white mb-6"
+    >
+      <div class="grid sm:grid-cols-3 gap-4 mb-4">
+        <InputText
+          v-model="advancedFilters.title"
+          :placeholder="$t('Filter by title')"
+        />
+        <InputText
+          v-model="advancedFilters.category"
+          :placeholder="$t('Filter by category')"
+        />
+        <Dropdown
+          v-if="languages.length > 1"
+          v-model="advancedFilters.language"
+          :options="languages"
+          optionLabel="originalName"
+          optionValue="isocode"
+          :placeholder="$t('Filter by language')"
+          class="w-full"
+        />
+      </div>
+
+      <div
+        class="grid sm:grid-cols-3 gap-4 mb-4"
+        v-if="searchExtraFields.length > 0"
+      >
+        <template
+          v-for="field in searchExtraFields"
+          :key="field.variable"
+        >
+          <InputText
+            v-if="field.value_type === 'text'"
+            v-model="advancedFilters[field.variable]"
+            :placeholder="field.display_text"
+          />
+        </template>
+      </div>
 
+      <div class="text-right">
+        <Button
+          :label="$t('Search')"
+          icon="pi pi-search"
+          class="p-button-sm p-button-primary"
+          @click="applyAdvancedSearch"
+        />
+      </div>
+    </div>
     <div
       v-if="status"
       class="text-center text-gray-500 py-6"
@@ -44,6 +107,8 @@
         :key="course.id"
         :course="course"
         :current-user-id="currentUserId"
+        :show-title="showCourseTitle"
+        :card-extra-fields="cardExtraFields"
         @rate="onRatingChange"
         @subscribed="onUserSubscribed"
       />
@@ -58,11 +123,10 @@
   </div>
 </template>
 <script setup>
-import { computed, onMounted, onUnmounted, ref, watch } from "vue"
+import { computed, onMounted, ref, watch } from "vue"
 import InputText from "primevue/inputtext"
 import Button from "primevue/button"
 import { FilterMatchMode } from "primevue/api"
-import courseService from "../../services/courseService"
 import { useNotification } from "../../composables/notification"
 import { useLanguage } from "../../composables/language"
 import { useSecurityStore } from "../../store/securityStore"
@@ -70,19 +134,136 @@ import CatalogueCourseCard from "../../components/course/CatalogueCourseCard.vue
 import * as userRelCourseVoteService from "../../services/userRelCourseVoteService"
 import { useRouter } from "vue-router"
 import { usePlatformConfig } from "../../store/platformConfig"
+import { useI18n } from "vue-i18n"
+import courseService from "../../services/courseService"
 
+const { t } = useI18n()
+const sortField = ref("title")
+
+const standardSortOptions = computed(() => {
+  return courseCatalogueSettings.value.standard_sort_options ?? {}
+})
+
+const extraSortOptions = computed(() => {
+  return courseCatalogueSettings.value.extra_field_sort_options ?? {}
+})
+
+const allSortOptions = computed(() => {
+  const standard = Object.entries(standardSortOptions.value).map(([key, value]) => ({
+    label: t(key.replace("point_info/", "")),
+    value: key,
+    order: value,
+    type: "standard",
+  }))
+  const extra = Object.entries(extraSortOptions.value).map(([key, value]) => ({
+    label: key,
+    value: key,
+    order: value,
+    type: "extra",
+  }))
+  return [...standard, ...extra]
+})
+
+const cardExtraFields = computed(() => {
+  const allowed = courseCatalogueSettings.value.extra_fields_in_course_block ?? []
+  return extraFields.value.filter((field) => allowed.includes(field.variable))
+})
+
+const showAdvancedSearch = ref(false)
+const advancedFilters = ref({
+  title: "",
+  category: "",
+  language: "",
+})
+
+const extraFields = ref([])
 const { showErrorNotification } = useNotification()
-const { findByIsoCode } = useLanguage()
+const { languageList } = useLanguage()
+const languages = languageList
 const router = useRouter()
 const securityStore = useSecurityStore()
+
 const platformConfigStore = usePlatformConfig()
+const courseCatalogueSettings = computed(() => {
+  const raw = platformConfigStore.getSetting("course.course_catalog_settings")
+  if (raw === false || raw === "false") return {}
+  try {
+    return typeof raw === "string" ? JSON.parse(raw) : (raw ?? {})
+  } catch (e) {
+    console.error("Invalid catalogue settings format", e)
+    return {}
+  }
+})
+
+const searchExtraFields = computed(() => {
+  const allowed = courseCatalogueSettings.value.extra_fields_in_search_form ?? []
+  return extraFields.value.filter((field) => allowed.includes(field.variable))
+})
+
+const showCourseTitle = computed(() => courseCatalogueSettings.value.hide_course_title !== true)
+
+const redirectAfterSubscription = computed(
+  () => courseCatalogueSettings.value.redirect_after_subscription ?? "course_catalog",
+)
+
+const onUserSubscribed = ({ courseId, newUser }) => {
+  const course = courses.value.find((c) => c.id === courseId)
+  if (course) {
+    course.users.push(newUser)
+    if (redirectAfterSubscription.value === "course_home") {
+      router.push({ name: "CourseHome", params: { id: courseId } })
+    }
+  }
+}
+
+const applyAdvancedSearch = () => {
+  filteredCourses.value = courses.value.filter((course) => {
+    const keyword = filters.value.global.value?.toLowerCase()
+    const matchesGlobal =
+      !keyword || course.title?.toLowerCase().includes(keyword) || course.description?.toLowerCase().includes(keyword)
+
+    const matchesTitle =
+      !advancedFilters.value.title || course.title?.toLowerCase().includes(advancedFilters.value.title.toLowerCase())
+
+    const matchesCategory =
+      !advancedFilters.value.category ||
+      course.categories?.some((cat) => cat.title?.toLowerCase().includes(advancedFilters.value.category.toLowerCase()))
+
+    const matchesLanguage =
+      !advancedFilters.value.language ||
+      course.courseLanguage?.toLowerCase().includes(advancedFilters.value.language?.toLowerCase())
+
+    const matchesExtras = extraFields.value.every((field) => {
+      const val = advancedFilters.value[field.variable]
+      if (!val) return true
+      const fieldValue = course.extra_fields?.[field.variable]
+      return typeof fieldValue === "string" ? fieldValue.toLowerCase().includes(val.toLowerCase()) : true
+    })
+
+    return matchesGlobal && matchesTitle && matchesCategory && matchesLanguage && matchesExtras
+  })
 
-if (!securityStore.user?.id) {
-  router.push({ name: "Login" })
-  throw new Error("No active session. Redirecting to login.")
+  visibleCount.value = rowsPerScroll
 }
 
-const currentUserId = securityStore.user.id
+const allowCatalogueAccess = computed(() => {
+  const allowStudents = platformConfigStore.getSetting("display.allow_students_to_browse_courses") !== "false"
+  const allowPublished = platformConfigStore.getSetting("course.course_catalog_published") !== "false"
+  return allowStudents && allowPublished
+})
+
+if (!allowCatalogueAccess.value) {
+  if (!securityStore.user?.id) {
+    router.push({ name: "Login" })
+  } else if (securityStore.user?.status === 5) {
+    router.push({ name: "Home" })
+  } else {
+    router.push({ name: "Index" })
+  }
+  throw new Error("Catalogue access denied by settings")
+}
+
+const currentUserId = securityStore.user?.id ?? null
 const status = ref(false)
 const courses = ref([])
 const filters = ref({ global: { value: null, matchMode: FilterMatchMode.CONTAINS } })
@@ -91,39 +272,39 @@ const rowsPerScroll = 9
 const visibleCount = ref(rowsPerScroll)
 const loadingMore = ref(false)
 
-const onUserSubscribed = ({ courseId, newUser }) => {
-  const course = courses.value.find((c) => c.id === courseId)
-  if (course) {
-    course.users.push(newUser)
+const loadExtraFields = async () => {
+  try {
+    const response = await fetch("/catalogue/course-extra-fields")
+    if (!response.ok) throw new Error("Failed to load extra fields")
+    extraFields.value = await response.json()
+  } catch (error) {
+    console.error("Error loading extra fields", error)
   }
 }
 
 const load = async () => {
   status.value = true
   try {
-    const { items } = await courseService.listAll({}, true)
-    courses.value = items.map((course) => ({
-      ...course,
-      courseLanguage: findByIsoCode(course.courseLanguage)?.originalName || course.courseLanguage,
-      userVote: null,
-    }))
-
-    const votes = await userRelCourseVoteService.getUserVotes({
-      userId: currentUserId,
-      urlId: window.access_url_id,
-    })
+    courses.value = await courseService.loadCourseCatalogue()
 
-    for (const vote of votes) {
-      let courseId
-      if (typeof vote.course === "object" && vote.course !== null) {
-        courseId = vote.course.id
-      } else if (typeof vote.course === "string") {
-        courseId = parseInt(vote.course.split("/").pop())
-      }
+    if (currentUserId) {
+      const votes = await userRelCourseVoteService.getUserVotes({
+        userId: currentUserId,
+        urlId: window.access_url_id,
+      })
+
+      for (const vote of votes) {
+        let courseId
+        if (typeof vote.course === "object" && vote.course !== null) {
+          courseId = vote.course.id
+        } else if (typeof vote.course === "string") {
+          courseId = parseInt(vote.course.split("/").pop())
+        }
 
-      const course = courses.value.find((c) => c.id === courseId)
-      if (course) {
-        course.userVote = vote
+        const course = courses.value.find((c) => c.id === courseId)
+        if (course) {
+          course.userVote = vote
+        }
       }
     }
   } catch (error) {
@@ -135,11 +316,8 @@ const load = async () => {
 
 onMounted(() => {
   window.addEventListener("scroll", handleScroll)
-  load()
-})
-
-onUnmounted(() => {
-  window.removeEventListener("scroll", handleScroll)
+  load().then(() => applyAdvancedSearch())
+  loadExtraFields()
 })
 
 const clearFilter = () => {
@@ -147,29 +325,53 @@ const clearFilter = () => {
   visibleCount.value = rowsPerScroll
 }
 
-const filteredCourses = computed(() => {
-  const keyword = filters.value.global.value?.toLowerCase()
-  if (!keyword) return courses.value
-  return courses.value.filter(
-    (course) =>
-      course.title?.toLowerCase().includes(keyword) ||
-      course.description?.toLowerCase().includes(keyword) ||
-      course.categories?.some((cat) => cat.title.toLowerCase().includes(keyword)) ||
-      course.courseLanguage?.toLowerCase().includes(keyword),
-  )
-})
-
+const filteredCourses = ref([])
 const visibleCoursesBase = computed(() => {
   const hidePrivate = platformConfigStore.getSetting("platform.course_catalog_hide_private") === "true"
+  const sortOpt = allSortOptions.value.find((opt) => opt.value === sortField.value)
+
+  let list = filteredCourses.value.filter((course) => {
+    const visibility = Number(course.visibility)
+    if (visibility === 0 || visibility === 4) return false
+    if (visibility === 1 && hidePrivate) return false
+    return true
+  })
+
+  if (sortOpt) {
+    const field = sortOpt.value
+    const order = sortOpt.order
+
+    list = list.slice().sort((a, b) => {
+      let valA = null,
+        valB = null
 
-  return filteredCourses.value
-    .filter((course) => {
-      const visibility = Number(course.visibility)
-      if (visibility === 0 || visibility === 4) return false
-      if (visibility === 1 && hidePrivate) return false
-      return true
+      if (sortOpt.type === "standard") {
+        if (field.startsWith("point_info/")) {
+          const key = field.split("/")[1]
+          valA = a.point_info?.[key] ?? 0
+          valB = b.point_info?.[key] ?? 0
+        } else if (field === "count_users") {
+          valA = a.users?.length ?? 0
+          valB = b.users?.length ?? 0
+        } else {
+          valA = a[field] ?? ""
+          valB = b[field] ?? ""
+        }
+      } else {
+        valA = a.extra_fields?.[field] ?? ""
+        valB = b.extra_fields?.[field] ?? ""
+      }
+
+      if (typeof valA === "string") valA = valA.toLowerCase()
+      if (typeof valB === "string") valB = valB.toLowerCase()
+
+      if (valA < valB) return -1 * order
+      if (valA > valB) return 1 * order
+      return 0
     })
-    .sort((a, b) => a.title.localeCompare(b.title, undefined, { numeric: true, sensitivity: "base" }))
+  }
+
+  return list
 })
 
 const visibleCourses = computed(() => {
@@ -228,14 +430,13 @@ const saveOrUpdateVote = async (course, value) => {
 
       course.userVote = { ...existingVote, vote: updated.vote }
     } else {
-      const newVote = await userRelCourseVoteService.saveVote({
+      course.userVote = await userRelCourseVoteService.saveVote({
         courseIri,
         userId: currentUserId,
         vote: value,
         sessionId,
         urlId,
       })
-      course.userVote = newVote
     }
   } catch (e) {
     showErrorNotification(e)
@@ -243,7 +444,7 @@ const saveOrUpdateVote = async (course, value) => {
 }
 
 const onRatingChange = ({ value, course }) => {
-  if (value > 0) {
+  if (value > 0 && currentUserId) {
     saveOrUpdateVote(course, value)
   }
 }
diff --git a/src/CoreBundle/Controller/CatalogueController.php b/src/CoreBundle/Controller/CatalogueController.php
index 2885866fe51..9975e3995bc 100644
--- a/src/CoreBundle/Controller/CatalogueController.php
+++ b/src/CoreBundle/Controller/CatalogueController.php
@@ -6,16 +6,19 @@
 
 namespace Chamilo\CoreBundle\Controller;
 
+use Chamilo\CoreBundle\Entity\Admin;
 use Chamilo\CoreBundle\Entity\CatalogueCourseRelAccessUrlRelUsergroup;
 use Chamilo\CoreBundle\Entity\CatalogueSessionRelAccessUrlRelUsergroup;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\UsergroupRelUser;
 use Chamilo\CoreBundle\Entity\UserRelCourseVote;
 use Chamilo\CoreBundle\Repository\Node\CourseRepository;
 use Chamilo\CoreBundle\Repository\SessionRepository;
 use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper;
 use Chamilo\CoreBundle\ServiceHelper\UserHelper;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -164,4 +167,88 @@ public function listSessions(): JsonResponse
 
         return $this->json($data);
     }
+
+    #[Route('/course-extra-fields', name: 'chamilo_core_catalogue_course_extra_fields', methods: ['GET'])]
+    public function getCourseExtraFields(SettingsManager $settingsManager): JsonResponse
+    {
+        if ('true' !== $settingsManager->getSetting('course.allow_course_extra_field_in_catalog')) {
+            return $this->json([]);
+        }
+
+        $extraField = new \ExtraField('course');
+        $fields = $extraField->get_all(['filter' => 1]);
+
+        $result = array_map(function ($field) {
+            return [
+                'variable' => $field['variable'],
+                'display_text' => $field['display_text'],
+                'value_type' => $field['value_type'],
+            ];
+        }, $fields);
+
+        return $this->json($result);
+    }
+
+    #[Route('/auto-subscribe-course/{courseId}', name: 'chamilo_core_catalogue_auto_subscribe_course', methods: ['POST'])]
+    public function autoSubscribeCourse(int $courseId, SettingsManager $settings): JsonResponse
+    {
+        $user = $this->userHelper->getCurrent();
+        $course = $this->em->getRepository(Course::class)->find($courseId);
+
+        if (!$user || !$course) {
+            return $this->json(['error' => 'Course or user not found'], 400);
+        }
+
+        $useAutoSession = $settings->getSetting('session.catalog_course_subscription_in_user_s_session', true) === 'true';
+
+        if ($useAutoSession) {
+            $session = new Session();
+            $timestamp = (new \DateTime())->format('Ymd_His');
+            $sessionTitle = sprintf('%s %s - Session %s', $user->getFirstname(), $user->getLastname(), $timestamp);
+            $session->setTitle($sessionTitle);
+
+            $session->setAccessStartDate(new \DateTime());
+            $session->setAccessEndDate(null);
+            $session->setCoachAccessEndDate(null);
+            $session->setDisplayEndDate(null);
+            $session->setSendSubscriptionNotification(false);
+
+            $adminIdSetting = $settings->getSetting('session.session_automatic_creation_user_id');
+            $adminId = null;
+
+            if (is_numeric($adminIdSetting) && (int) $adminIdSetting > 0) {
+                $adminUser = $this->em->getRepository(User::class)->find((int) $adminIdSetting);
+                if ($adminUser) {
+                    $adminId = $adminUser->getId();
+                }
+            }
+
+            if (!$adminId) {
+                $adminEntity = $this->em->getRepository(Admin::class)->findOneBy([]);
+                if ($adminEntity) {
+                    $adminId = $adminEntity->getUser()->getId();
+                }
+            }
+
+            if ($adminId) {
+                $adminUser = $this->em->getRepository(User::class)->find($adminId);
+                if ($adminUser) {
+                    $session->addSessionAdmin($adminUser);
+                }
+            }
+
+            $session->addUserInSession(Session::STUDENT, $user);
+            $session->addAccessUrl($this->accessUrlHelper->getCurrent());
+            $session->addCourse($course);
+            $session->addUserInCourse(Session::STUDENT, $user, $course);
+
+            $this->em->persist($session);
+            $this->em->flush();
+        }
+
+        return $this->json([
+            'message' => 'User subscribed successfully.',
+            'sessionId' => $session?->getId(),
+        ]);
+    }
 }
diff --git a/src/CoreBundle/Controller/PlatformConfigurationController.php b/src/CoreBundle/Controller/PlatformConfigurationController.php
index 9b9f49b7bea..eca5ecaba43 100644
--- a/src/CoreBundle/Controller/PlatformConfigurationController.php
+++ b/src/CoreBundle/Controller/PlatformConfigurationController.php
@@ -47,6 +47,16 @@ public function list(SettingsManager $settingsManager): Response
         ];
 
         $configuration['settings']['registration.allow_registration'] = $settingsManager->getSetting('registration.allow_registration', true);
+        $configuration['settings']['course.course_catalog_published'] = $settingsManager->getSetting('course.course_catalog_published', true);
+        $configuration['settings']['course.catalog_hide_public_link'] = $settingsManager->getSetting('course.catalog_hide_public_link', true);
+        $configuration['settings']['course.allow_course_extra_field_in_catalog'] = $settingsManager->getSetting('course.allow_course_extra_field_in_catalog', true);
+        $configuration['settings']['course.course_catalog_display_in_home'] = $settingsManager->getSetting('course.course_catalog_display_in_home', true);
+        $configuration['settings']['course.courses_catalogue_show_only_category'] = $settingsManager->getSetting('course.courses_catalogue_show_only_category', true);
+        $configuration['settings']['display.allow_students_to_browse_courses'] = $settingsManager->getSetting('display.allow_students_to_browse_courses', true);
+        $configuration['settings']['session.catalog_allow_session_auto_subscription'] = $settingsManager->getSetting('session.catalog_allow_session_auto_subscription', true);
+        $configuration['settings']['session.catalog_course_subscription_in_user_s_session'] = $settingsManager->getSetting('session.catalog_course_subscription_in_user_s_session', true);
+        $rawSetting = $settingsManager->getSetting('course.course_catalog_settings', true);
+        $configuration['settings']['course.course_catalog_settings'] = $this->decodeSettingArray($rawSetting);
 
         $variables = [];
 
@@ -96,6 +106,8 @@ public function list(SettingsManager $settingsManager): Response
                 'exercise.allow_exercise_auto_launch',
                 'course.access_url_specific_files',
                 'platform.course_catalog_hide_private',
+                'course.show_courses_descriptions_in_catalog',
+                'session.session_automatic_creation_user_id',
             ];
 
             $user = $this->userHelper->getCurrent();
@@ -158,4 +170,41 @@ public function courseSettingsList(
 
         return new JsonResponse(['settings' => $settings]);
     }
+
+    /**
+     * Attempts to decode a setting value that may be stored as:
+     * - native PHP array
+     * - JSON string
+     * - PHP array code string
+     */
+    private function decodeSettingArray(mixed $setting): array
+    {
+        // Already an array, return as is
+        if (is_array($setting)) {
+            return $setting;
+        }
+
+        // Try to decode JSON string
+        if (is_string($setting)) {
+            $json = json_decode($setting, true);
+            if (is_array($json)) {
+                return $json;
+            }
+
+            // Try to evaluate PHP-style array string
+            $trimmed = rtrim($setting, ';');
+            try {
+                $evaluated = eval("return $trimmed;");
+                if (is_array($evaluated)) {
+                    return $evaluated;
+                }
+            } catch (\Throwable $e) {
+                // Log error and continue
+                error_log("Failed to eval setting value: " . $e->getMessage());
+            }
+        }
+
+        // Return empty array as fallback
+        return [];
+    }
 }
diff --git a/src/CoreBundle/Entity/Course.php b/src/CoreBundle/Entity/Course.php
index 6b6cd00c25d..75e9c3db057 100644
--- a/src/CoreBundle/Entity/Course.php
+++ b/src/CoreBundle/Entity/Course.php
@@ -17,6 +17,7 @@
 use Chamilo\CoreBundle\Entity\Listener\CourseListener;
 use Chamilo\CoreBundle\Entity\Listener\ResourceListener;
 use Chamilo\CoreBundle\Repository\Node\CourseRepository;
+use Chamilo\CoreBundle\State\PublicCatalogueCourseStateProvider;
 use Chamilo\CourseBundle\Entity\CGroup;
 use Chamilo\CourseBundle\Entity\CTool;
 use DateTime;
@@ -35,20 +36,18 @@
     types: ['https://schema.org/Course'],
     operations: [
         new Get(security: "is_granted('VIEW', object)"),
-        new Post(),
-        new GetCollection(),
+        new Post(security: "is_granted('ROLE_USER')"),
+        new GetCollection(security: "is_granted('ROLE_USER')"),
+        new GetCollection(
+            uriTemplate: '/public_courses',
+            normalizationContext: ['groups' => ['course:read']],
+            provider: PublicCatalogueCourseStateProvider::class
+        ),
     ],
-    normalizationContext: [
-        'groups' => ['course:read'],
-    ],
-    denormalizationContext: [
-        'groups' => ['course:write'],
-    ],
-    filters: [
-        'course.sticky_boolean_filter',
-    ],
-    paginationClientEnabled: true,
-    security: "is_granted('ROLE_USER')",
+    normalizationContext: ['groups' => ['course:read']],
+    denormalizationContext: ['groups' => ['course:write']],
+    filters: ['course.sticky_boolean_filter'],
+    paginationClientEnabled: true
 )]
 #[ORM\Table(name: 'course')]
 #[ORM\Index(columns: ['sticky'], name: 'idx_course_sticky')]
diff --git a/src/CoreBundle/Repository/ExtraFieldValuesRepository.php b/src/CoreBundle/Repository/ExtraFieldValuesRepository.php
index 8bc775c492d..de488500466 100644
--- a/src/CoreBundle/Repository/ExtraFieldValuesRepository.php
+++ b/src/CoreBundle/Repository/ExtraFieldValuesRepository.php
@@ -199,6 +199,21 @@ public function getLpIdWithDaysForCompletion(): array
         return $qb->getQuery()->getResult();
     }
 
+    public function getValueByVariableAndItem(string $variable, int $itemId, int $itemType): ?ExtraFieldValues
+    {
+        $qb = $this->createQueryBuilder('v')
+            ->innerJoin('v.field', 'f')
+            ->andWhere('f.variable = :variable')
+            ->andWhere('f.itemType = :itemType')
+            ->andWhere('v.itemId = :itemId')
+            ->setParameter('variable', $variable)
+            ->setParameter('itemType', $itemType)
+            ->setParameter('itemId', $itemId)
+            ->setMaxResults(1);
+
+        return $qb->getQuery()->getOneOrNullResult();
+    }
+
     public function getByHandlerAndFieldId(int $itemId, int $fieldId, int $itemType, bool $transform = false): array
     {
         $qb = $this->createQueryBuilder('efv');
@@ -214,7 +229,6 @@ public function getByHandlerAndFieldId(int $itemId, int $fieldId, int $itemType,
                 'item_type' => $itemType,
             ])
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
     }
 }
diff --git a/src/CoreBundle/State/PublicCatalogueCourseStateProvider.php b/src/CoreBundle/State/PublicCatalogueCourseStateProvider.php
new file mode 100644
index 00000000000..932532d7383
--- /dev/null
+++ b/src/CoreBundle/State/PublicCatalogueCourseStateProvider.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Repository\ExtraFieldValuesRepository;
+use Chamilo\CoreBundle\Repository\Node\AccessUrlRepository;
+use Chamilo\CoreBundle\Repository\Node\CourseRepository;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+
+readonly class PublicCatalogueCourseStateProvider implements ProviderInterface
+{
+    public function __construct(
+        private CourseRepository $courseRepository,
+        private SettingsManager $settingsManager,
+        private AccessUrlRepository $accessUrlRepository,
+        private RequestStack $requestStack,
+        private ExtraFieldValuesRepository $extraFieldValuesRepository,
+        private TokenStorageInterface $tokenStorage
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|null|object
+    {
+        $user = $this->tokenStorage->getToken()?->getUser();
+        $isAuthenticated = \is_object($user);
+
+        if (!$isAuthenticated) {
+            $showCatalogue = $this->settingsManager->getSetting('course.course_catalog_published', true) !== 'false';
+            if (!$showCatalogue) {
+                return [];
+            }
+        }
+
+        $onlyShowMatching = $this->settingsManager->getSetting('course.show_courses_in_catalogue', true) === 'true';
+        $onlyShowCoursesWithCategory = $this->settingsManager->getSetting('course.courses_catalogue_show_only_category', true) === 'true';
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (!$request) {
+            return [];
+        }
+
+        $host = $request->getSchemeAndHttpHost() . '/';
+        $accessUrl = $this->accessUrlRepository->findOneBy(['url' => $host]) ?? $this->accessUrlRepository->find(1);
+        $courses = $this->courseRepository->createQueryBuilder('c')
+            ->innerJoin('c.urls', 'url_rel')
+            ->andWhere('url_rel.url = :accessUrl')
+            ->andWhere('c.visibility IN (:visibilities)')
+            ->setParameter('accessUrl', $accessUrl)
+            ->setParameter('visibilities', [Course::OPEN_WORLD, Course::OPEN_PLATFORM])
+            ->orderBy('c.title', 'ASC')
+            ->getQuery()
+            ->getResult();
+
+        if (!$onlyShowMatching && !$onlyShowCoursesWithCategory) {
+            return $courses;
+        }
+
+        $filtered = [];
+        foreach ($courses as $course) {
+            $passesExtraField = true;
+            $passesCategory = true;
+
+            if ($onlyShowMatching) {
+                $value = $this->extraFieldValuesRepository->getValueByVariableAndItem(
+                    'show_in_catalogue',
+                    $course->getId(),
+                    ExtraField::COURSE_FIELD_TYPE
+                );
+                $passesExtraField = $value?->getFieldValue() === '1';
+            }
+
+            if ($onlyShowCoursesWithCategory) {
+                $passesCategory = $course->getCategories()->count() > 0;
+            }
+
+            if ($passesExtraField && $passesCategory) {
+                $filtered[] = $course;
+            }
+        }
+
+        return $filtered;
+    }
+}