Resolve merge conflicts with upstream/master

assets/css/scss/organisms/_sidebar.scss

@@ -106,7 +106,7 @@
 
       > .p-panelmenu-header-content a {
         .p-menuitem-text {
-          @apply order-2 grow text-body-2 font-semibold whitespace-nowrap;
+          @apply order-2 grow text-body-2 font-semibold;
         }
       }
     }

assets/vue/composables/language.js

@@ -0,0 +1,22 @@
+export function useLanguage() {
+  const defaultLanguage = { originalName: "English", isocode: "en" }
+
+  /**
+   * @type {{originalName: string, isocode: string}[]}
+   */
+  const languageList = window.languages || [defaultLanguage]
+
+  /**
+   * @param {string} isoCode
+   * @returns {{originalName: string, isocode: string}|undefined}
+   */
+  function findByIsoCode(isoCode) {
+    return languageList.find((language) => isoCode === language.isocode)
+  }
+
+  return {
+    defaultLanguage,
+    languageList,
+    findByIsoCode,
+  }
+}

assets/vue/router/account.js

@@ -1,14 +1,14 @@
 export default {
-  path: '/account',
+  path: "/account",
   meta: { requiresAuth: true },
-  name: 'account',
-  component: () => import('../components/course/Layout.vue'),
+  name: "account",
+  component: () => import("../components/course/Layout.vue"),
   children: [
     {
-      name: 'AccountHome',
-      path: 'home',
-      component: () => import('../views/account/Home.vue'),
-      meta: {requiresAuth: true},
+      name: "AccountHome",
+      path: "home",
+      component: () => import("../views/account/Home.vue"),
+      meta: { requiresAuth: true },
     },
-  ]
-};
+  ],
+}

assets/vue/router/admin.js

@@ -1,21 +1,20 @@
 export default {
-    path: '/admin',
-    name: 'admin',
-    meta: { requiresAuth: true, showBreadcrumb: true },
-    component: () => import('../components/admin/AdminLayout.vue'),
-    children: [
-        {
-            path: '',
-            name: 'AdminIndex',
-            meta: { requiresAdmin: true, requiresSessionAdmin: true, showBreadcrumb: false },
-            component: () => import('../views/admin/AdminIndex.vue'),
-        },
-      {
-        name: 'AdminConfigurationColors',
-        path: 'configuration/colors',
-        meta: { requiresAdmin: true, requiresSessionAdmin: true, showBreadcrumb: true },
-        component: () => import('../views/admin/AdminConfigureColors.vue'),
-      }
-    ],
-};
-
+  path: "/admin",
+  name: "admin",
+  meta: { requiresAuth: true, showBreadcrumb: true },
+  component: () => import("../components/admin/AdminLayout.vue"),
+  children: [
+    {
+      path: "",
+      name: "AdminIndex",
+      meta: { requiresAdmin: true, requiresSessionAdmin: true, showBreadcrumb: false },
+      component: () => import("../views/admin/AdminIndex.vue"),
+    },
+    {
+      name: "AdminConfigurationColors",
+      path: "configuration/colors",
+      meta: { requiresAdmin: true, requiresSessionAdmin: true, showBreadcrumb: true },
+      component: () => import("../views/admin/AdminConfigureColors.vue"),
+    },
+  ],
+}

assets/vue/router/assignments.js

@@ -25,4 +25,4 @@ export default {
       props: true,
     },
   ],
-};
+}

assets/vue/router/cataloguecourses.js

@@ -1,6 +1,6 @@
 export default {
-    path: '/catalogue/courses',
-    name: 'CatalogueCourses',
-    meta: { requiresAdmin: true, requiresSessionAdmin: true },
-    component: () => import('../views/course/CatalogueCourses.vue')
-};
+  path: "/catalogue/courses",
+  name: "CatalogueCourses",
+  meta: { requiresAdmin: true, requiresSessionAdmin: true },
+  component: () => import("../views/course/CatalogueCourses.vue"),
+}

assets/vue/router/cataloguesessions.js

@@ -1,6 +1,6 @@
 export default {
-    path: '/catalogue/sessions',
-    name: 'CatalogueSessions',
-    meta: { requiresAdmin: true, requiresSessionAdmin: true },
-    component: () => import('../views/course/CatalogueSessions.vue')
-};
+  path: "/catalogue/sessions",
+  name: "CatalogueSessions",
+  meta: { requiresAdmin: true, requiresSessionAdmin: true },
+  component: () => import("../views/course/CatalogueSessions.vue"),
+}

assets/vue/router/ccalendarevent.js

@@ -1,25 +1,25 @@
 export default {
-  path: '/resources/ccalendarevent',
+  path: "/resources/ccalendarevent",
   meta: { requiresAuth: true },
-  name: 'ccalendarevent',
-  redirect: { name: 'CCalendarEventList' },
-  component: () => import('../components/ccalendarevent/CCalendarEventLayout.vue'),
+  name: "ccalendarevent",
+  redirect: { name: "CCalendarEventList" },
+  component: () => import("../components/ccalendarevent/CCalendarEventLayout.vue"),
   children: [
     {
-      name: 'CCalendarEventShow',
-      path: 'show',
-      component: () => import('../views/ccalendarevent/CCalendarEventShow.vue')
+      name: "CCalendarEventShow",
+      path: "show",
+      component: () => import("../views/ccalendarevent/CCalendarEventShow.vue"),
     },
     {
-      name: 'CCalendarEventCreate',
-      path: 'new',
-      component: () => import('../views/ccalendarevent/CCalendarEventCreate.vue')
+      name: "CCalendarEventCreate",
+      path: "new",
+      component: () => import("../views/ccalendarevent/CCalendarEventCreate.vue"),
     },
     {
-      name: 'CCalendarEventList',
-      path: '',
-      component: () => import('../views/ccalendarevent/CCalendarEventList.vue'),
-      props: (route) => ({ type: route.query.type })
-    }
-  ]
-};
+      name: "CCalendarEventList",
+      path: "",
+      component: () => import("../views/ccalendarevent/CCalendarEventList.vue"),
+      props: (route) => ({ type: route.query.type }),
+    },
+  ],
+}

assets/vue/router/course.js

@@ -1,29 +1,29 @@
 export default {
-  path: '/resources/courses',
+  path: "/resources/courses",
   meta: { requiresAuth: true },
-  name: 'courses',
-  component: () => import('../components/course/Layout.vue'),
-  redirect: { name: 'CourseList' },
+  name: "courses",
+  component: () => import("../components/course/Layout.vue"),
+  redirect: { name: "CourseList" },
   children: [
     {
-      name: 'CourseList',
-      path: '',
-      component: () => import('../views/course/List.vue')
+      name: "CourseList",
+      path: "",
+      component: () => import("../views/course/List.vue"),
     },
     {
-      name: 'CourseCreate',
-      path: 'new',
-      component: () => import('../views/course/Create.vue')
+      name: "CourseCreate",
+      path: "new",
+      component: () => import("../views/course/Create.vue"),
     },
     {
-      name: 'CourseUpdate',
-      path: ':id/edit',
-      component: () => import('../views/course/Update.vue')
+      name: "CourseUpdate",
+      path: ":id/edit",
+      component: () => import("../views/course/Update.vue"),
     },
     {
-      name: 'CourseShow',
-      path: ':id',
-      component: () => import('../views/course/Show.vue')
-    }
-  ]
-};
+      name: "CourseShow",
+      path: ":id",
+      component: () => import("../views/course/Show.vue"),
+    },
+  ],
+}

assets/vue/router/coursecategory.js

@@ -1,29 +1,29 @@
 export default {
-  path: '/resources/course_categories',
+  path: "/resources/course_categories",
   meta: { requiresAuth: true },
-  name: 'course_categories',
-  component: () => import('../components/coursecategory/Layout.vue'),
-  redirect: { name: 'CourseCategoryList' },
+  name: "course_categories",
+  component: () => import("../components/coursecategory/Layout.vue"),
+  redirect: { name: "CourseCategoryList" },
   children: [
     {
-      name: 'CourseCategoryList',
-      path: '',
-      component: () => import('../views/coursecategory/List.vue')
+      name: "CourseCategoryList",
+      path: "",
+      component: () => import("../views/coursecategory/List.vue"),
     },
     {
-      name: 'CourseCategoryCreate',
-      path: 'new',
-      component: () => import('../views/coursecategory/Create.vue')
+      name: "CourseCategoryCreate",
+      path: "new",
+      component: () => import("../views/coursecategory/Create.vue"),
     },
     {
-      name: 'CourseCategoryUpdate',
-      path: ':id/edit',
-      component: () => import('../views/coursecategory/Update.vue')
+      name: "CourseCategoryUpdate",
+      path: ":id/edit",
+      component: () => import("../views/coursecategory/Update.vue"),
     },
     {
-      name: 'CourseCategoryShow',
-      path: ':id',
-      component: () => import('../views/coursecategory/Show.vue')
-    }
-  ]
-};
+      name: "CourseCategoryShow",
+      path: ":id",
+      component: () => import("../views/coursecategory/Show.vue"),
+    },
+  ],
+}

assets/vue/router/ctoolintro.js

@@ -1,25 +1,25 @@
 export default {
-  path: '/resources/ctoolintro/',
+  path: "/resources/ctoolintro/",
   meta: { requiresAuth: true, showBreadcrumb: true },
-  name: 'ctoolintro',
-  component: () => import('../components/ctoolintro/Layout.vue'),
-  redirect: { name: 'ToolIntroList' },
+  name: "ctoolintro",
+  component: () => import("../components/ctoolintro/Layout.vue"),
+  redirect: { name: "ToolIntroList" },
   children: [
     {
-      name: 'ToolIntroCreate',
-      path: 'new/:courseTool',
-      component: () => import('../views/ctoolintro/Create.vue')
+      name: "ToolIntroCreate",
+      path: "new/:courseTool",
+      component: () => import("../views/ctoolintro/Create.vue"),
     },
     {
-      name: 'ToolIntroUpdate',
+      name: "ToolIntroUpdate",
       //path: ':id/edit',
-      path: 'edit',
-      component: () => import('../views/ctoolintro/Update.vue')
+      path: "edit",
+      component: () => import("../views/ctoolintro/Update.vue"),
     },
     {
-      name: 'ToolIntroShow',
-      path: '',
-      component: () => import('../views/ctoolintro/Show.vue')
-    }
-  ]
-};
+      name: "ToolIntroShow",
+      path: "",
+      component: () => import("../views/ctoolintro/Show.vue"),
+    },
+  ],
+}