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 chore/login

Browse source 
# Conflicts:
#	backend/.env.example
#	backend/package.json
#	backend/src/app.ts
#	backend/src/routes/login.ts
#	backend/src/routes/student.ts
#	docker-compose.yml
#	frontend/src/App.vue
#	frontend/src/views/HomePage.vue
#	frontend/src/views/LoginPage.vue
#	package-lock.json
This commit is contained in:
Gerald Schmittinger 2025-03-09 23:42:38 +01:00
commit de0199de96
109 changed files with 3789 additions and 1727 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import {createRouter, createWebHistory} from "vue-router";
import { createRouter, createWebHistory } from "vue-router";
import MenuBar from "@/components/MenuBar.vue";
import StudentHomepage from "@/views/StudentHomepage.vue";
import StudentAssignments from "@/views/assignments/StudentAssignments.vue";
@ -23,12 +23,12 @@ const router = createRouter({
{
path: "/",
name: "home",
component: () => {return import("../views/HomePage.vue")},
component: () => import("../views/HomePage.vue"),
},
{
path: "/login",
name: "LoginPage",
component: () => {return import("../views/LoginPage.vue")}
component: () => import("../views/LoginPage.vue"),
},
{
path: "/callback",
@ -41,24 +41,24 @@ const router = createRouter({
{
path: "home",
name: "StudentHomePage",
component: StudentHomepage
component: StudentHomepage,
},
{
path: "assignment",
name: "StudentAssignments",
component: StudentAssignments
component: StudentAssignments,
},
{
path: "class",
name: "StudentClasses",
component: StudentClasses
component: StudentClasses,
},
{
path: "discussion",
name: "StudentDiscussions",
component: StudentDiscussions
component: StudentDiscussions,
},
]
],
},
{
@ -68,56 +68,54 @@ const router = createRouter({
{
path: "home",
name: "TeacherHomepage",
component: TeacherHomepage
component: TeacherHomepage,
},
{
path: "assignment",
name: "TeacherAssignments",
component: TeacherAssignments
component: TeacherAssignments,
},
{
path: "class",
name: "TeacherClasses",
component: TeacherClasses
component: TeacherClasses,
},
{
path: "discussion",
name: "TeacherDiscussions",
component: TeacherDiscussions
component: TeacherDiscussions,
},
]
],
},
{
path: "/assignment/create",
name: "CreateAssigment",
component: CreateAssignment
component: CreateAssignment,
},
{
path: "/assignment/:id",
name: "SingleAssigment",
component: SingleAssignment
component: SingleAssignment,
},
{
path: "/class/create",
name: "CreateClass",
component: CreateClass
component: CreateClass,
},
{
path: "/class/:id",
name: "SingleClass",
component: SingleClass
component: SingleClass,
},
{
path: "/discussion/create",
name: "CreateDiscussion",
component: CreateDiscussion
component: CreateDiscussion,
},
{
path: "/discussion/:id",
name: "SingleDiscussion",
component: SingleDiscussion
component: SingleDiscussion,
},
{
path: "/:catchAll(.*)",