Merge pull request #217 from SELab-2/projects-page-functionality

Projects page & basic students page functionality
SELab-2 · Apr 28, 2022 · 405eb56 · 405eb56
2 parents 5e88742 + 01f92b2
commit 405eb56
Show file tree

Hide file tree

Showing 19 changed files with 4,524 additions and 549 deletions.
diff --git a/backend/src/main/kotlin/be/osoc/team1/backend/controllers/EditionController.kt b/backend/src/main/kotlin/be/osoc/team1/backend/controllers/EditionController.kt
@@ -46,7 +46,6 @@ class EditionController(val service: EditionService) {
      * Returns the currently active edition, or null if there is no active edition.
      */
     @GetMapping("/active")
-    @Secured("ROLE_ADMIN")
     fun getActiveEdition(): Edition? = service.getActiveEdition()
 
     /**

diff --git a/frontend/components/Header.tsx b/frontend/components/Header.tsx
@@ -3,12 +3,14 @@ import { useRouter } from 'next/router';
 import { PropsWithChildren } from 'react';
 import useUser from '../hooks/useUser';
 import { UserRole } from '../lib/types';
+import useEdition from '../hooks/useEdition';
 
 type HeaderProps = PropsWithChildren<unknown>;
 
 const Header: React.FC<HeaderProps> = () => {
   const router = useRouter();
   const [user] = useUser();
+  const [edition] = useEdition();
   const current_path = router.pathname;
 
   return (
@@ -30,14 +32,14 @@ const Header: React.FC<HeaderProps> = () => {
               current_path === '/students' ? 'underline' : ''
             }`}
           >
-            <Link href="/students">Select Students</Link>
+            <Link href={`/${edition}/students`}>Select Students</Link>
           </li>
           <li
             className={`ml-3 hover:underline sm:inline ${
               current_path === '/projects' ? 'underline' : ''
             }`}
           >
-            <Link href="/projects">Projects</Link>
+            <Link href={`/${edition}/projects`}>Projects</Link>
           </li>
           <li
             className={`ml-3 hover:underline sm:inline ${