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

Merge remote-tracking branch 'origin/dev' into feat/pagina-om-leerpaden-te-bekijken-#41

Browse source 
# Conflicts:
#	frontend/src/components/MenuBar.vue
#	frontend/src/i18n/locale/de.json
#	frontend/src/i18n/locale/en.json
#	frontend/src/i18n/locale/fr.json
#	frontend/src/i18n/locale/nl.json
#	frontend/src/main.ts
#	frontend/src/router/index.ts
#	frontend/src/views/HomePage.vue
This commit is contained in:
Gerald Schmittinger 2025-03-25 08:55:40 +01:00
commit 7c55c3a081
27 changed files with 1718 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
import { createRouter, createWebHistory } from "vue-router";
import MenuBar from "@/components/MenuBar.vue";
import StudentHomepage from "@/views/homepage/StudentHomepage.vue";
import SingleAssignment from "@/views/assignments/SingleAssignment.vue";
import SingleClass from "@/views/classes/SingleClass.vue";
import SingleDiscussion from "@/views/discussions/SingleDiscussion.vue";
@ -16,6 +15,8 @@ import authState from "@/services/auth/auth-service.ts";
import LearningPathPage from "@/views/learning-paths/LearningPathPage.vue";
import path from "path";
import LearningPathSearchPage from "@/views/learning-paths/LearningPathSearchPage.vue";
import UserHomePage from "@/views/homepage/UserHomePage.vue";
import SingleTheme from "@/views/SingleTheme.vue";
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
@ -44,9 +45,9 @@ const router = createRouter({
meta: { requiresAuth: true },
children: [
{
path: "home",
path: "",
name: "UserHomePage",
component: StudentHomepage,
component: UserHomePage,
},
{
path: "assignment",
@ -66,6 +67,12 @@ const router = createRouter({
],
},
{
path: "/theme/:id",
name: "Theme",
component: SingleTheme,
meta: { requiresAuth: true },
},
{
path: "/assignment/create",
name: "CreateAssigment",
@ -135,7 +142,8 @@ router.beforeEach(async (to, from, next) => {
// Verify if user is logged in before accessing certain routes
if (to.meta.requiresAuth) {
if (!authState.isLoggedIn.value) {
next("/login");
//Next("/login");
next();
} else {
next();
}