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

fix: probleem inloggen mergeconflict

Browse source
This commit is contained in:
laurejablonski 2025-04-21 09:10:46 +02:00
parent d7d90abfb1
commit 7144359283
3 changed files with 8926 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,12 +8,12 @@ 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 UserClasses from "@/views/classes/UserClasses.vue";
import UserAssignments from "@/views/assignments/UserAssignments.vue"; import UserAssignments from "@/views/assignments/UserAssignments.vue";
import authState from "@/services/auth/auth-service.ts";
import LearningPathPage from "@/views/learning-paths/LearningPathPage.vue"; import LearningPathPage from "@/views/learning-paths/LearningPathPage.vue";
import LearningPathSearchPage from "@/views/learning-paths/LearningPathSearchPage.vue"; import LearningPathSearchPage from "@/views/learning-paths/LearningPathSearchPage.vue";
import UserHomePage from "@/views/homepage/UserHomePage.vue"; import UserHomePage from "@/views/homepage/UserHomePage.vue";
import SingleTheme from "@/views/SingleTheme.vue"; import SingleTheme from "@/views/SingleTheme.vue";
import LearningObjectView from "@/views/learning-paths/learning-object/LearningObjectView.vue"; import LearningObjectView from "@/views/learning-paths/learning-object/LearningObjectView.vue";
import authService from "@/services/auth/auth-service";
const router = createRouter({ const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL), history: createWebHistory(import.meta.env.BASE_URL),

9178
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

3
package.json
View file

@ -41,5 +41,8 @@
"eslint-config-prettier": "^10.0.1", "eslint-config-prettier": "^10.0.1",
"jiti": "^2.4.2", "jiti": "^2.4.2",
"typescript-eslint": "^8.24.1" "typescript-eslint": "^8.24.1"
},
"dependencies": {
"swagger": "^0.7.5"
} }
} }