tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
Archived
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

refactor(frontend): Minimisation

Browse source
This commit is contained in:
Tibo De Peuter 2025-05-20 11:56:09 +02:00
parent 6090a9d12e
commit 798f51c089
Signed by: tdpeuter
GPG key ID: 38297DE43F75FFE2
6 changed files with 43 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/package.json
View file

@ -26,6 +26,7 @@
"oidc-client-ts": "^3.1.0", "oidc-client-ts": "^3.1.0",
"rollup": "^4.40.0", "rollup": "^4.40.0",
"uuid": "^11.1.0", "uuid": "^11.1.0",
"vite-plugin-vuetify": "^2.1.1",
"vue": "^3.5.13", "vue": "^3.5.13",
"vue-i18n": "^11.1.2", "vue-i18n": "^11.1.2",
"vue-router": "^4.5.0", "vue-router": "^4.5.0",

4
frontend/src/main.ts
View file

@ -3,8 +3,6 @@ import { createApp } from "vue";
// Vuetify // Vuetify
import "vuetify/styles"; import "vuetify/styles";
import { createVuetify } from "vuetify"; import { createVuetify } from "vuetify";
import * as components from "vuetify/components";
import * as directives from "vuetify/directives";
import i18n from "./i18n/i18n.ts"; import i18n from "./i18n/i18n.ts";
// JSON-editor // JSON-editor
@ -28,8 +26,6 @@ link.href = "https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.
document.head.appendChild(link); document.head.appendChild(link);
const vuetify = createVuetify({ const vuetify = createVuetify({
components,
directives,
icons: { icons: {
defaultSet: "mdi", defaultSet: "mdi",
aliases, aliases,

84
frontend/src/router/index.ts
View file

@ -1,23 +1,10 @@
import { createRouter, createWebHistory } from "vue-router"; import { createRouter, createWebHistory } from 'vue-router';
import SingleAssignment from "@/views/assignments/SingleAssignment.vue"; import authService from '@/services/auth/auth-service';
import SingleClass from "@/views/classes/SingleClass.vue"; import { allowRedirect, Redirect } from '@/utils/redirect.ts';
import SingleDiscussion from "@/views/discussions/SingleDiscussion.vue"; import HomePage from '@/views/HomePage.vue';
import NotFound from "@/components/errors/NotFound.vue"; import LoginPage from '@/views/LoginPage.vue';
import CreateAssignment from "@/views/assignments/CreateAssignment.vue"; import NotFound from '@/components/errors/NotFound.vue';
import CreateDiscussion from "@/views/discussions/CreateDiscussion.vue"; import CallbackPage from '@/views/CallbackPage.vue';
import CallbackPage from "@/views/CallbackPage.vue";
import UserClasses from "@/views/classes/UserClasses.vue";
import UserAssignments from "@/views/assignments/UserAssignments.vue";
import LearningPathPage from "@/views/learning-paths/LearningPathPage.vue";
import LearningPathSearchPage from "@/views/learning-paths/LearningPathSearchPage.vue";
import UserHomePage from "@/views/homepage/UserHomePage.vue";
import SingleTheme from "@/views/SingleTheme.vue";
import LearningObjectView from "@/views/learning-paths/learning-object/LearningObjectView.vue";
import authService from "@/services/auth/auth-service";
import DiscussionForward from "@/views/discussions/DiscussionForward.vue";
import NoDiscussion from "@/views/discussions/NoDiscussion.vue";
import OwnLearningContentPage from "@/views/own-learning-content/OwnLearningContentPage.vue";
import { allowRedirect, Redirect } from "@/utils/redirect.ts";
const router = createRouter({ const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL), history: createWebHistory(import.meta.env.BASE_URL),
@ -25,13 +12,13 @@ const router = createRouter({
{ {
path: "/", path: "/",
name: "home", name: "home",
component: async (): Promise<unknown> => import("../views/HomePage.vue"), component: HomePage,
meta: { requiresAuth: false }, meta: { requiresAuth: false },
}, },
{ {
path: "/login", path: "/login",
name: "LoginPage", name: "LoginPage",
component: async (): Promise<unknown> => import("../views/LoginPage.vue"), component: LoginPage,
meta: { requiresAuth: false }, meta: { requiresAuth: false },
}, },
{ {
@ -47,25 +34,24 @@ const router = createRouter({
{ {
path: "", path: "",
name: "UserHomePage", name: "UserHomePage",
component: UserHomePage, component: async() : Promise<unknown> => import("@/views/homepage/UserHomePage.vue"),
}, },
{ {
path: "assignment", path: "assignment",
name: "UserAssignments", name: "UserAssignments",
component: UserAssignments, component: async() : Promise<unknown> => import("@/views/assignments/UserAssignments.vue"),
}, },
{ {
path: "class", path: "class",
name: "UserClasses", name: "UserClasses",
component: UserClasses, component: async() : Promise<unknown> => import("@/views/classes/UserClasses.vue"),
}, },
], ],
}, },
{ {
path: "/theme/:theme", path: "/theme/:theme",
name: "Theme", name: "Theme",
component: SingleTheme, component: async(): Promise<unknown> => import("@/views/SingleTheme.vue"),
props: true, props: true,
meta: { requiresAuth: true }, meta: { requiresAuth: true },
}, },
@ -76,75 +62,77 @@ const router = createRouter({
{ {
path: "create", path: "create",
name: "CreateAssigment", name: "CreateAssigment",
component: CreateAssignment, component: async() : Promise<unknown> => import("@/views/assignments/CreateAssignment.vue"),
}, },
{ {
path: ":classId/:id", path: ":classId/:id",
name: "SingleAssigment", name: "SingleAssigment",
component: SingleAssignment, component: async() : Promise<unknown> => import("@/views/assignments/SingleAssignment.vue"),
}, },
], ],
}, },
{ {
path: "/class/:id", path: "/class/:id",
name: "SingleClass", name: "SingleClass",
component: SingleClass, component: async() : Promise<unknown> => import("@/views/classes/SingleClass.vue"),
meta: { requiresAuth: true },
},
{
path: "/discussion/create",
name: "CreateDiscussion",
component: CreateDiscussion,
meta: { requiresAuth: true }, meta: { requiresAuth: true },
}, },
{ {
path: "/discussion", path: "/discussion",
name: "Discussions",
component: NoDiscussion,
meta: { requiresAuth: true }, meta: { requiresAuth: true },
children: [
{
path: "",
name: "Discussions",
component: async() : Promise<unknown> => import("@/views/discussions/NoDiscussion.vue"),
}, },
{ {
path: "/discussion/:hruid/:language/:learningObjectHruid", path: "/create",
name: "CreateDiscussion",
component: async() : Promise<unknown> => import("@/views/discussions/CreateDiscussion.vue"),
},
{
path: "/:hruid/:language/:learningObjectHruid",
name: "SingleDiscussion", name: "SingleDiscussion",
component: SingleDiscussion, component: async() : Promise<unknown> => import("@/views/discussions/SingleDiscussion.vue"),
props: true, props: true,
meta: { requiresAuth: true }, },
]
}, },
{ {
path: "/discussion-reload/:hruid/:language/:learningObjectHruid", path: "/discussion-reload/:hruid/:language/:learningObjectHruid",
name: "DiscussionForwardWorkaround", name: "DiscussionForwardWorkaround",
component: DiscussionForward, component: async() : Promise<unknown> => import("@/views/discussions/DiscussionForward.vue"),
props: true, props: true,
meta: { requiresAuth: true }, meta: { requiresAuth: true },
}, },
{ {
path: "/my-content", path: "/my-content",
name: "OwnLearningContentPage", name: "OwnLearningContentPage",
component: OwnLearningContentPage, component: async() : Promise<unknown> => import("@/views/own-learning-content/OwnLearningContentPage.vue"),
meta: { requiresAuth: true }, meta: { requiresAuth: true },
}, },
{ {
path: "/learningPath", path: "/learningPath",
meta: { requiresAuth: true },
children: [ children: [
{ {
path: "search", path: "search",
name: "LearningPathSearchPage", name: "LearningPathSearchPage",
component: LearningPathSearchPage, component: async() : Promise<unknown> => import("@/views/learning-paths/LearningPathSearchPage.vue"),
meta: { requiresAuth: true },
}, },
{ {
path: ":hruid/:language/:learningObjectHruid", path: ":hruid/:language/:learningObjectHruid",
name: "LearningPath", name: "LearningPath",
component: LearningPathPage, component: async() : Promise<unknown> => import("@/views/learning-paths/LearningPathPage.vue"),
props: true, props: true,
meta: { requiresAuth: true },
}, },
], ],
}, },
{ {
path: "/learningObject/:hruid/:language/:version/raw", path: "/learningObject/:hruid/:language/:version/raw",
name: "LearningObjectView", name: "LearningObjectView",
component: LearningObjectView, component: async() : Promise<unknown> => import("@/views/learning-paths/learning-object/LearningObjectView.vue"),
props: true, props: true,
meta: { requiresAuth: true }, meta: { requiresAuth: true },
}, },

2
frontend/src/services/auth/auth-service.ts
View file

@ -4,7 +4,7 @@
import { computed, reactive } from "vue"; import { computed, reactive } from "vue";
import type { AuthState, Role, UserManagersForRoles } from "@/services/auth/auth.d.ts"; import type { AuthState, Role, UserManagersForRoles } from "@/services/auth/auth.d.ts";
import { User, UserManager } from "oidc-client-ts"; import { type User, UserManager } from "oidc-client-ts";
import { AUTH_CONFIG_ENDPOINT, loadAuthConfig } from "@/services/auth/auth-config-loader.ts"; import { AUTH_CONFIG_ENDPOINT, loadAuthConfig } from "@/services/auth/auth-config-loader.ts";
import authStorage from "./auth-storage.ts"; import authStorage from "./auth-storage.ts";
import { loginRoute } from "@/config.ts"; import { loginRoute } from "@/config.ts";

1
frontend/src/views/own-learning-content/learning-paths/LearningPathPreviewCard.vue
View file

@ -11,7 +11,6 @@
import { Language } from "@/data-objects/language"; import { Language } from "@/data-objects/language";
import type { LearningPath } from "@dwengo-1/common/interfaces/learning-content"; import type { LearningPath } from "@dwengo-1/common/interfaces/learning-content";
import type { AxiosError } from "axios"; import type { AxiosError } from "axios";
import { parse } from "uuid";
const { t } = useI18n(); const { t } = useI18n();

1
package-lock.json generated
View file

@ -117,6 +117,7 @@
"oidc-client-ts": "^3.1.0", "oidc-client-ts": "^3.1.0",
"rollup": "^4.40.0", "rollup": "^4.40.0",
"uuid": "^11.1.0", "uuid": "^11.1.0",
"vite-plugin-vuetify": "^2.1.1",
"vue": "^3.5.13", "vue": "^3.5.13",
"vue-i18n": "^11.1.2", "vue-i18n": "^11.1.2",
"vue-router": "^4.5.0", "vue-router": "^4.5.0",