Merge remote-tracking branch 'origin/dev' into feat/pagina-om-leerpaden-te-bekijken-#41
# Conflicts: # frontend/src/App.vue # frontend/src/components/MenuBar.vue # frontend/src/main.ts
This commit is contained in:
		
						commit
						8522cde18d
					
				
					 68 changed files with 868 additions and 896 deletions
				
			
		|  | @ -1,5 +1,4 @@ | |||
| import { createRouter, createWebHistory } from "vue-router"; | ||||
| import MenuBar from "@/components/MenuBar.vue"; | ||||
| import SingleAssignment from "@/views/assignments/SingleAssignment.vue"; | ||||
| import SingleClass from "@/views/classes/SingleClass.vue"; | ||||
| import SingleDiscussion from "@/views/discussions/SingleDiscussion.vue"; | ||||
|  | @ -41,7 +40,6 @@ const router = createRouter({ | |||
| 
 | ||||
|         { | ||||
|             path: "/user", | ||||
|             component: MenuBar, | ||||
|             meta: { requiresAuth: true }, | ||||
|             children: [ | ||||
|                 { | ||||
|  |  | |||
		Reference in a new issue
	
	 Gerald Schmittinger
						Gerald Schmittinger