Merge pull request #52 from SELab-2/groups

opdracht student, leerkracht en groepen pagina statische versie
SELab-2 · Mar 13, 2024 · 548e8a3 · 548e8a3
2 parents 1064a49 + 6ffeac2
commit 548e8a3
Show file tree

Hide file tree

Showing 8 changed files with 518 additions and 40 deletions.
diff --git a/frontend/frontend/.vite/deps/_metadata.json b/frontend/frontend/.vite/deps/_metadata.json
@@ -0,0 +1,8 @@
+{
+  "hash": "ea10a7bd",
+  "configHash": "baf76694",
+  "lockfileHash": "e3b0c442",
+  "browserHash": "89947c23",
+  "optimized": {},
+  "chunks": {}
+}
diff --git a/frontend/frontend/.vite/deps/package.json b/frontend/frontend/.vite/deps/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/frontend/frontend/package-lock.json b/frontend/frontend/package-lock.json
diff --git a/frontend/frontend/package.json b/frontend/frontend/package.json
@@ -10,12 +10,14 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@emotion/react": "^11.11.3",
+    "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.0",
     "@fontsource/roboto": "^5.0.8",
     "@mui/icons-material": "^5.15.11",
-    "@mui/material": "^5.15.11",
+    "@mui/material": "^5.15.12",
+    "@mui/x-date-pickers": "^6.19.6",
     "axios": "^1.6.7",
+    "dayjs": "^1.11.10",
     "i18next": "^23.10.0",
     "i18next-browser-languagedetector": "^7.2.0",
     "i18next-http-backend": "^2.5.0",

diff --git a/frontend/frontend/src/main.tsx b/frontend/frontend/src/main.tsx
@@ -8,17 +8,36 @@ import ErrorPage from "./pages/ErrorPage.tsx";
 
 import {MainPage} from "./pages/mainPage/MainPage.tsx";
 import {Helmet, HelmetProvider} from "react-helmet-async";
+import { SubjectsStudentPage } from "./pages/subjects_page/SubjectsStudentPage.tsx";
+import { AssignmentStudentPage } from "./pages/assignmentPage/assignmentStudentPage";
+import { AssignmentTeacherPage } from "./pages/assignmentPage/assignmentTeacherPage.tsx";
+import { GroupsPage } from "./pages/groupsPage/groupsPage.tsx";
 import {SubjectsStudentPage} from "./pages/subjects_page/SubjectsStudentPage.tsx";
 import {SimpleRequestsPage} from "./pages/simpleRequestsPage/SimpleRequestsPage.tsx";
 
-
 const router = createBrowserRouter([
-    {
-        path: "/",
-        element: <MainPage/>,
-        errorElement: <ErrorPage/>,
-    },
-    {
+  {
+    path: "/",
+    element: <MainPage />,
+    errorElement: <ErrorPage />,
+  },
+  {
+    path: "/subjects_student",
+    element: <SubjectsStudentPage />,
+  },
+  {
+    path: "/assignment_student",
+    element: <AssignmentStudentPage />,
+  },
+  {
+    path: "/assignment_teacher",
+    element: <AssignmentTeacherPage/>,
+  },
+  {
+    path: "/groups",
+    element: <GroupsPage/>,
+  },
+   {
         path: "/subjects_student",
         element: <SubjectsStudentPage/>,
     },